updating help for Number Format

- update access commands to match menus
- make display of some items more module conditional


Change-Id: Ie0c7b05b54f8744575ec4f354e8ea1c77272b464
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/86168
Tested-by: Jenkins
Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>

2 files changed, 31 insertions, 15 deletions

diff --git a/source/text/shared/00/00040503.xhp b/source/text/shared/00/00040503.xhp
index d60fb28d0f..34396e0503 100644
--- a/source/text/shared/00/00040503.xhp
+++ b/source/text/shared/00/00040503.xhp
@@ -38,11 +38,20 @@
 <paragraph role="paragraph" id="par_id3150756" xml-lang="en-US">Open context menu of a column header in a database table - choose <emph>Column Width</emph>.</paragraph>
 </section>
 <section id="zahlen">
-<paragraph role="paragraph" id="par_id3148668" xml-lang="en-US"><switchinline select="appl"><caseinline select="CALC">Choose <emph>Format - Cells - Numbers</emph> tab.</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3152349" xml-lang="en-US"><switchinline select="appl"><caseinline select="CALC">Choose <emph>View - Styles</emph> - open context menu and choose <emph>Modify/New - Numbers</emph> tab.</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3161459" xml-lang="en-US">Open context menu for a column header in an open database table - choose <emph>Column Format - Format</emph> tab.</paragraph>
-<paragraph role="paragraph" id="par_id3147531" xml-lang="en-US">Choose <emph>Format - Axis - Y Axis - Numbers</emph> tab (Chart Documents).</paragraph>
-<paragraph role="paragraph" id="par_id3150823" xml-lang="en-US">Also as <emph>Number Format</emph> dialog for tables and fields in text documents: Choose <emph>Format - Number Format</emph>, or choose <emph>Insert - Field - More Fields - Variables</emph> tab and select <emph>Additional formats</emph> in the <emph>Format</emph> list.</paragraph>
+<switch select="appl">
+<case select="CALC">
+   <paragraph role="paragraph" id="par_id3148668" xml-lang="en-US">Choose <menuitem>Format - Cells - Numbers</menuitem> tab.</paragraph>
+   <paragraph role="paragraph" id="par_id3152349" xml-lang="en-US">Choose <menuitem>View - Styles</menuitem> (F11) - open context menu and choose <emph>Modify/New - Numbers</emph> tab.</paragraph>
+</case>
+<case select="BASE">
+   <paragraph role="paragraph" id="par_id3161459" xml-lang="en-US">Open context menu for a column header in an open database table - choose <menuitem>Column Format - Format</menuitem> tab.</paragraph>
+</case>
+<case select="WRITER">
+   <paragraph role="paragraph" id="par_id3150823" xml-lang="en-US">Choose <menuitem>Table - Number Format</menuitem> (for tables).</paragraph>
+   <paragraph role="paragraph" id="par_id231578229435232">Choose <menuitem>Insert - Field - More Fields - Variables</menuitem> tab and select <emph>Additional formats</emph> in the <emph>Format</emph> list (for variables).</paragraph>
+</case>
+</switch>
+<paragraph role="paragraph" id="par_id3147531" xml-lang="en-US">Choose <menuitem>Format - Axis - Y Axis - Numbers</menuitem> tab (chart documents).</paragraph>
 </section>
 <section id="fozelaus">
 <paragraph role="paragraph" id="par_id3154923" xml-lang="en-US"><switchinline select="appl"><caseinline select="CHART">Choose <emph>Format - Title - Main Title - Alignment</emph> tab.</caseinline><defaultinline>Choose <emph>Format - Cells - Alignment</emph> tab.</defaultinline></switchinline></paragraph>
@@ -72,4 +81,4 @@
 <paragraph role="paragraph" id="par_id3149064" xml-lang="en-US">Open context menu - choose <emph>Distribution</emph> ($[officename] Impress).</paragraph>
 </section>
 </body>
-</helpdocument>
+</helpdocument>
\ No newline at end of file
diff --git a/source/text/shared/01/05020300.xhp b/source/text/shared/01/05020300.xhp
index 4911763d67..672ee51863 100644
--- a/source/text/shared/01/05020300.xhp
+++ b/source/text/shared/01/05020300.xhp
@@ -37,7 +37,10 @@
 <bookmark xml-lang="en-US" branch="hid/cui/ui/numberingformatpage/@@nowidget@@" id="bm_id3150147" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:TableNumberFormatDialog" id="bm_id2370759" localize="false"/>
   <paragraph xml-lang="en-US" id="hd_id3152942" role="heading" level="1">Numbers / Format</paragraph>
-  <paragraph xml-lang="en-US" id="par_id3145071" role="paragraph"><variable id="zahlen"><ahelp hid=".uno:TableNumberFormatDialog">Specify the formatting options for the selected cell(s).</ahelp></variable></paragraph>
+<switch select="appl">
+<case select="WRITER"><paragraph xml-lang="en-US" id="par_id3145086" role="paragraph">Specify the formatting option for the selected variable.</paragraph></case>
+<default><paragraph xml-lang="en-US" id="par_id3145071" role="paragraph"><variable id="zahlen"><ahelp hid=".uno:TableNumberFormatDialog">Specify the formatting options for the selected cell(s).</ahelp></variable></paragraph></default>
+</switch>
 <section id="howtoget">
   <embed href="text/shared/00/00040503.xhp#zahlen"/>
 </section>
@@ -51,7 +54,7 @@
 </switch>
 <bookmark xml-lang="en-US" branch="hid/cui/ui/numberingformatpage/formatlb" id="bm_id3155449" localize="false"/>
   <paragraph xml-lang="en-US" id="hd_id3155342" role="heading" level="2">Format</paragraph>
-  <paragraph xml-lang="en-US" id="par_id3148491" role="paragraph"><ahelp hid="cui/ui/numberingformatpage/formatlb">Select how you want the contents of the selected cell(s) to be displayed.</ahelp> The code for the selected option is displayed in the <emph>Format Code</emph> box.</paragraph>
+  <paragraph xml-lang="en-US" id="par_id3148491" role="paragraph"><ahelp hid="cui/ui/numberingformatpage/formatlb">Select how you want the contents of the selected <switchinline select="appl"><caseinline select="CALC">cell(s) </caseinline><defaultinline>field</defaultinline></switchinline> to be displayed.</ahelp> The code for the selected option is displayed in the <emph>Format code</emph> box.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/cui/ui/numberingformatpage/currencylb" id="bm_id3154381" localize="false"/>
   <paragraph xml-lang="en-US" id="hd_id3154811" role="heading" level="3">Currency category list boxes</paragraph>
   <paragraph xml-lang="en-US" id="par_id3148563" role="paragraph"><ahelp hid="cui/ui/numberingformatpage/currencylb">Select a currency, and then scroll to the top of the <emph>Format</emph> list to view the formatting options for the currency.</ahelp></paragraph>
@@ -60,11 +63,15 @@
   </section>
 <bookmark xml-lang="en-US" branch="hid/cui/ui/numberingformatpage/languagelb" id="bm_id3148797" localize="false"/>
   <paragraph xml-lang="en-US" id="hd_id3154071" role="heading" level="2">Language</paragraph>
-  <paragraph xml-lang="en-US" id="par_id3154138" role="paragraph"><ahelp hid="cui/ui/numberingformatpage/languagelb">Specifies the language setting for the selected <switchinline select="appl"><caseinline select="CALC">cells </caseinline><defaultinline>fields</defaultinline></switchinline>. With the language set to <emph>Automatic</emph>, $[officename] automatically applies the number formats associated with the system default language. Select any language to fix the settings for the selected <switchinline select="appl"><caseinline select="CALC">cells</caseinline><defaultinline> fields</defaultinline></switchinline>.</ahelp></paragraph>
+  <paragraph xml-lang="en-US" id="par_id3154138" role="paragraph"><ahelp hid="cui/ui/numberingformatpage/languagelb">Specifies the language setting for the selected <switchinline select="appl"><caseinline select="CALC">cells</caseinline><defaultinline>field</defaultinline></switchinline>. <switchinline select="appl"><caseinline select="WRITER">With the language set to <emph>Automatic</emph>, $[officename] automatically applies the number formats associated with the system default language.</caseinline></switchinline> Select any language to fix the settings for the selected <switchinline select="appl"><caseinline select="CALC">cells</caseinline><defaultinline> fields</defaultinline></switchinline>.</ahelp></paragraph>
   <paragraph xml-lang="en-US" id="par_id3157320" role="paragraph">The language setting ensures that date and currency formats, as well as decimal and thousands separators, are preserved even when the document is opened in an operating system that uses a different default language setting.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui/ui/numberingformatpage/sourceformat" id="bm_id3145747" localize="false"/>
+<switch select="appl">
+<case select="CALC">
+  <bookmark xml-lang="en-US" branch="hid/cui/ui/numberingformatpage/sourceformat" id="bm_id3145747" localize="false"/>
   <paragraph xml-lang="en-US" id="hd_id3155995" role="heading" level="2">Source format</paragraph>
   <paragraph xml-lang="en-US" id="par_id3144432" role="paragraph"><ahelp hid="cui/ui/numberingformatpage/sourceformat">Uses the same number format as the cells containing the data for the chart.</ahelp></paragraph>
+</case>
+</switch>
   <paragraph xml-lang="en-US" id="hd_id3148451" role="heading" level="2">Options</paragraph>
   <paragraph xml-lang="en-US" id="par_id3148922" role="paragraph">Specify the options for the selected format.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/cui/ui/numberingformatpage/decimalsed" id="bm_id3151178" localize="false"/>
@@ -73,7 +80,7 @@
 <bookmark xml-lang="en-US" branch="hid/cui/ui/numberingformatpage/denominatored" id="bm_id3151179" localize="false"/>
   <paragraph xml-lang="en-US" id="hd_id3153971" role="heading" level="3">Denominator places</paragraph>
   <paragraph xml-lang="en-US" id="par_id3154685" role="paragraph"><ahelp hid="cui/ui/numberingformatpage/denominatored">With fraction format, enter the number of places for the denominator that you want to display.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui/ui/numberingformatpage/leadzerosed" id="bm_id3153106" localize="false"/>
+  <bookmark xml-lang="en-US" branch="hid/cui/ui/numberingformatpage/leadzerosed" id="bm_id3153106" localize="false"/>
   <paragraph xml-lang="en-US" id="hd_id3154819" role="heading" level="3">Leading zeroes</paragraph>
   <paragraph xml-lang="en-US" id="par_id3147352" role="paragraph"><ahelp hid="cui/ui/numberingformatpage/leadzerosed">Enter the maximum number of zeroes to display in front of the decimal point.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/cui/ui/numberingformatpage/negnumred" id="bm_id3157895" localize="false"/>
@@ -91,13 +98,13 @@
 <bookmark xml-lang="en-US" branch="hid/cui/ui/numberingformatpage/add" id="bm_id3163717" localize="false"/>
   <paragraph xml-lang="en-US" id="hd_id3155311" role="heading" level="3">Add</paragraph>
   <paragraph xml-lang="en-US" id="par_id3147219" role="paragraph"><ahelp hid="cui/ui/numberingformatpage/add">Adds the number format code that you entered to the user-defined category.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui/ui/numberingformatpage/delete" id="bm_id3159181" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/numberingformatpage/commented" id="bm_id3154470" localize="false"/>
+  <paragraph xml-lang="en-US" id="hd_id3153573" role="heading" level="3">Edit Comment</paragraph>
+  <paragraph xml-lang="en-US" id="par_id3083444" role="paragraph"><ahelp hid="cui/ui/numberingformatpage/edit">Adds a comment to the selected number format.</ahelp></paragraph>
+  <bookmark xml-lang="en-US" branch="hid/cui/ui/numberingformatpage/delete" id="bm_id3159181" localize="false"/>
   <paragraph xml-lang="en-US" id="hd_id3149263" role="heading" level="3">Delete</paragraph>
   <paragraph xml-lang="en-US" id="par_id3154150" role="paragraph"><ahelp hid="cui/ui/numberingformatpage/delete">Deletes the selected number format.</ahelp> The changes are effective after you restart $[officename].</paragraph>
 <bookmark xml-lang="en-US" branch="hid/cui/ui/numberingformatpage/edit" id="bm_id3151119" localize="false"/>
-  <paragraph xml-lang="en-US" id="hd_id3153573" role="heading" level="3">Edit Comment</paragraph>
-  <paragraph xml-lang="en-US" id="par_id3083444" role="paragraph"><ahelp hid="cui/ui/numberingformatpage/edit">Adds a comment to the selected number format.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui/ui/numberingformatpage/commented" id="bm_id3154470" localize="false"/>
   <paragraph xml-lang="en-US" id="hd_id3150332" role="heading" level="3">Name line</paragraph>
   <paragraph xml-lang="en-US" id="par_id3156060" role="paragraph"><ahelp hid="cui/ui/numberingformatpage/commented">Enter a comment for the selected number format, and then click outside this box.</ahelp></paragraph>
   <embed href="text/shared/00/00000001.xhp#vorschau"/>