Related:tdf#147107;tdf#144493 update B&N bar command names and explanations

tdf#144493 (008cfd5980f31c9e01b5cdbede33631d66f2fb56) changed command
names that are found in the Bullets and Numbering toolbar (and menus
in Writer, Draw, Impress).

tdf#147107 (3b222bcd75d57db404cd2ed5dc97a5c492c28060) made
adjustments to some of the command names changed for tdf#144493.

This patch addresses the consequences of these name changes for the
Bullet and Numbering toolbar in Writer, where the changed commands
also appear in the Format menu UI. Meanwhile, some of the help pages
for the changed commands are shared with Draw and Impress, so any
help file that needed to be changed for Writer was also updated for
Draw and Impress. In addition to updating the changes in the command
names, the descriptions of the commands were evaluated and corrected
when necessary.

text/swriter/main0206.xhp (B&N Bar)
*reorder controls on help page to correspond to order on toolbar

text/shared/02/06100000.xhp (Move Item Up)
+ appl-inline switch for <h1> and icon name to distinguish
Writer from the other modules
* adjustments and corrections in descriptions
+ add appl-switch for mentioning toolbar and shortcut keys
+ add link to relevant toolbar
* correction in command sequence for shortcut keys for Writer
and Impress.
* refactor to <keycode>,<menuitem>

text/shared/02/06110000.xhp (Move Item Down)
+ appl-inline switch for <h1> and icon name to distinguish
Writer from the other modules
* adjustments and corrections in descriptions
+ add appl-switch for mentioning toolbar and shortcut keys
+ add link to relevant toolbar
* correction in command sequence for shortcut keys for Writer
and Impress.
* refactor to <keycode>,<menuitem>

text/shared/02/06120000.xhp (Move Item Up with Subpoints)
* correct the description, with separate explanations for
list paragraphs and chapter headings, and mention of
multiple selection.
* update command name
* change .png to .svg

text/shared/02/06130000.xhp (Move Item Down with Subpoints)
* correct the description, with separate explanations for
list paragraphs and chapter headings, and mention of
multiple selection.
* update command name
* change .png to .svg

text/shared/02/06050000.xhp (Demote Outline Level)
* simplify the appl-inline switch for <h1>
* correct the description
+ add separate explanations for chapter headings
and list paragraphs for Writer
+ add link to B&N toolbar
+ add shortcut key info for Impress
* refactor to <menuitem>

text/shared/02/06060000.xhp (Promote Outline Level)
* simplify the appl-inline switch for <h1>
* correct the description
+ add separate explanations for chapter headings
and list paragraphs for Writer
+ add link to B&N toolbar
+ add shortcut key info for Impress
* refactor to <menuitem>

text/swriter/02/06070000.xhp (Demote Outline Level with Subpoints)
* correct the description
* update command and icon name
* refactor to <h1>
* change .png to .svg
* change icon size to 1cm
- remove <colspan="" rowspan="">

text/swriter/02/06080000.xhp (Promote Outline Level with Subpoints)
* correct the description
* update command and icon name
* refactor to <h1>
* change .png to .svg
* change icon size to 1cm
- remove <colspan="" rowspan="">

Change-Id: Iaedfebe4f260658bb1f5821ef279846eba22415a
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/132870
Tested-by: Jenkins
Reviewed-by: Seth Chaiklin <sdc.blanco@youmail.dk>

4 files changed, 45 insertions, 27 deletions

diff --git a/source/text/shared/02/06050000.xhp b/source/text/shared/02/06050000.xhp
index 8fc483a77b..70941518a0 100644
--- a/source/text/shared/02/06050000.xhp
+++ b/source/text/shared/02/06050000.xhp
@@ -20,7 +20,7 @@
 
 <meta>
   <topic id="textshared0206050000xml" indexer="include" status="PUBLISH">
-    <title id="tit" xml-lang="en-US">Demote One Level</title>
+    <title id="tit" xml-lang="en-US">Demote Outline Level</title>
     <filename>/text/shared/02/06050000.xhp</filename>
   </topic>
   <history>
@@ -31,12 +31,11 @@
 <section id="demote_one_level">
 <bookmark xml-lang="en-US" branch="hid/.uno:OutlineRight" id="bm_id7638577" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:DecrementLevel" id="bm_id6945277" localize="false"/>
-<h1 id="hd_id3148983"><switchinline select="appl"><caseinline select="WRITER"><link href="text/shared/02/06050000.xhp" name="Demote One Level">Demote One Level</link></caseinline>
-<defaultinline><link href="text/shared/02/06050000.xhp" name="Demote">Demote</link></defaultinline></switchinline></h1>
-<paragraph role="paragraph" id="par_id3147285" xml-lang="en-US"><ahelp hid=".">Moves the selected paragraph down one level in a numbering or bullets hierarchy.</ahelp><comment>UFI: need two files for numbering and outline, also for 06060000.xhp</comment></paragraph>
+  <h1 id="hd_id3148983"><link href="text/shared/02/06050000.xhp" name="Demote One Level">Demote<switchinline select="appl"><caseinline select="WRITER"> Outline Level</caseinline></switchinline></link></h1>
+<paragraph role="paragraph" id="par_id3147285" xml-lang="en-US"><ahelp hid="."><switchinline select="appl"><caseinline  select="WRITER">Moves a chapter heading where the cursor is located, or selected chapter headings, down one outline level. </caseinline></switchinline>Moves a list paragraph where the cursor is located, or selected list paragraphs, down one list level.</ahelp><comment>UFI: need two files for numbering and outline, also for 06060000.xhp</comment></paragraph>
 </section>
-<paragraph role="paragraph" id="par_id3149549" xml-lang="en-US"><switchinline select="appl"><caseinline select="WRITER">The<emph> Demote One Level </emph>icon is on the <emph>Bullets and Numbering</emph> bar, which appears when the cursor is positioned on a numbering or bullets item.</caseinline>
-<caseinline select="IMPRESS">The <emph>Demote</emph> icon is on the <emph>Text Formatting</emph> bar, which appears when working in the outline view.</caseinline></switchinline></paragraph>
+<paragraph role="paragraph" id="par_id3149549" xml-lang="en-US"><switchinline select="appl"><caseinline select="WRITER">The <menuitem>Demote Outline Level</menuitem> icon is on the <link href="text/swriter/main0206.xhp" name="BulletNumberingBar"><menuitem>Bullets and Numbering</menuitem></link> bar, which appears when the cursor is positioned on a numbered chapter heading or a list paragraph.</caseinline>
+<caseinline select="IMPRESS">The <menuitem>Demote</menuitem> icon is on the <menuitem>Outline</menuitem> bar, which appears when working in the outline view. This function can also be called by pressing <keycode>Alt+Shift+Right Arrow</keycode>.</caseinline></switchinline></paragraph>
 <section id="sydemote_one_level">
 <table id="tbl_id3153394">
   <tablerow>
@@ -44,7 +43,7 @@
       <paragraph role="paragraph" id="par_id3146957" xml-lang="en-US"><image id="img_id3143267" src="cmd/lc_decrementlevel.svg" width="1cm" height="1cm"><alt id="alt_id3143267" xml-lang="en-US">Icon Demote</alt></image></paragraph>
     </tablecell>
      <tablecell>
-        <paragraph role="paragraph" id="par_id3149096" xml-lang="en-US"><switchinline select="appl"><caseinline select="WRITER">Demote One Level</caseinline><defaultinline>Demote</defaultinline></switchinline></paragraph>
+        <paragraph role="paragraph" id="par_id3149096" xml-lang="en-US"><switchinline select="appl"><caseinline select="WRITER">Demote Outline Level</caseinline><defaultinline>Demote</defaultinline></switchinline></paragraph>
      </tablecell>
   </tablerow>
 </table>
diff --git a/source/text/shared/02/06060000.xhp b/source/text/shared/02/06060000.xhp
index 443c7fad67..45b26e90fb 100644
--- a/source/text/shared/02/06060000.xhp
+++ b/source/text/shared/02/06060000.xhp
@@ -20,7 +20,7 @@
 
 <meta>
   <topic id="textshared0206060000xml" indexer="include" status="PUBLISH">
-    <title id="tit" xml-lang="en-US">Promote One Level</title>
+    <title id="tit" xml-lang="en-US">Promote Outline Level</title>
     <filename>/text/shared/02/06060000.xhp</filename>
   </topic>
   <history>
@@ -31,12 +31,10 @@
 <section id="promote_one_level">
 <bookmark xml-lang="en-US" branch="hid/.uno:OutlineLeft" id="bm_id1102480" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:IncrementLevel" id="bm_id8156328" localize="false"/>
-<h1 id="hd_id3159225"><switchinline select="appl"><caseinline select="WRITER"><link href="text/shared/02/06060000.xhp" name="Promote One Level">Promote One Level</link>
-</caseinline><defaultinline><link href="text/shared/02/06060000.xhp" name="Promote">Promote</link></defaultinline></switchinline></h1>
-<paragraph role="paragraph" id="par_id3149999" xml-lang="en-US"><ahelp hid=".">Moves the selected paragraph up one level in the numbering or bullets hierarchy.</ahelp></paragraph>
+<h1 id="hd_id3159225"><link href="text/shared/02/06060000.xhp" name="Promote One Level">Promote<switchinline select="appl"><caseinline select="WRITER"> Outline Level</caseinline></switchinline></link></h1>
+<paragraph role="paragraph" id="par_id3149999" xml-lang="en-US"><ahelp hid="."><switchinline select="appl"><caseinline select="WRITER">Moves a chapter heading where the cursor is located, or selected chapter headings, up one outline level. </caseinline></switchinline>Moves a list paragraph where the cursor is located, or selected list paragraphs, up one list level.</ahelp></paragraph>
 </section>
-<paragraph role="paragraph" id="par_id3149205" xml-lang="en-US"><switchinline select="appl"><caseinline select="WRITER">The <emph>Promote One Level</emph> icon is on the <emph>Bullets and Numbering</emph> bar, which appears when the cursor is positioned on a numbering or bullets item.
-</caseinline><caseinline select="IMPRESS">The <emph>Promote</emph> icon is on the <emph>Text Formatting</emph> bar, which appears when working in the outline view.</caseinline></switchinline></paragraph>
+<paragraph role="paragraph" id="par_id3149205" xml-lang="en-US"><switchinline select="appl"><caseinline select="WRITER">The <menuitem>Promote Outline Level</menuitem> icon is on the <link href="text/swriter/main0206.xhp" name="BulletNumberingBar"><menuitem>Bullets and Numbering</menuitem></link> bar, which appears when the cursor is positioned on a numbered chapter heading or a list paragraph.</caseinline><caseinline select="IMPRESS">The <menuitem>Promote</menuitem> icon is on the <menuitem>Outline</menuitem> bar, which appears when working in the outline view. This function can also be called by pressing <keycode>Alt+Shift+Left Arrow</keycode>.</caseinline></switchinline></paragraph>
 <section id="sypromote_one_level">
 <table id="tbl_id3147008">
   <tablerow>
@@ -44,7 +42,7 @@
       <paragraph role="paragraph" id="par_id3149388" xml-lang="en-US"><image id="img_id3155535" src="cmd/lc_incrementlevel.svg" width="1cm" height="1cm"><alt id="alt_id3155535" xml-lang="en-US">Icon Promote</alt></image></paragraph>
     </tablecell>
     <tablecell>
-      <paragraph role="paragraph" id="par_id3146958" xml-lang="en-US"><switchinline select="appl"><caseinline select="WRITER">Promote One Level</caseinline><defaultinline>Promote</defaultinline></switchinline></paragraph>
+      <paragraph role="paragraph" id="par_id3146958" xml-lang="en-US"><switchinline select="appl"><caseinline select="WRITER">Promote Outline Level</caseinline><defaultinline>Promote</defaultinline></switchinline></paragraph>
     </tablecell>
   </tablerow>
 </table>
diff --git a/source/text/shared/02/06100000.xhp b/source/text/shared/02/06100000.xhp
index 8da249a3d5..9232fd1ded 100644
--- a/source/text/shared/02/06100000.xhp
+++ b/source/text/shared/02/06100000.xhp
@@ -31,13 +31,23 @@
 <section id="move_up">
 <bookmark xml-lang="en-US" branch="hid/.uno:OutlineUp" id="bm_id3154094" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:MoveUp" id="bm_id3148520" localize="false"/>
-<h1 id="hd_id3144740"><link href="text/shared/02/06100000.xhp" name="Move Up">Move Up</link></h1>
-<paragraph role="paragraph" id="par_id3109850" xml-lang="en-US"><ahelp hid=".">Positions the selected paragraph before the one above it.</ahelp></paragraph>
+<h1 id="hd_id3144740"><link href="text/shared/02/06100000.xhp" name="Move Up">Move <switchinline select="appl"><caseinline select="WRITER">Item </caseinline></switchinline>Up</link></h1>
+<paragraph role="paragraph" id="par_id3109850" xml-lang="en-US"><ahelp hid=".">Moves the paragraph where the cursor is located, or selected paragraphs, to before the previous paragraph.</ahelp></paragraph>
 </section>
-<paragraph role="paragraph" id="par_id3149283" xml-lang="en-US">If you have numbered paragraphs and click the <emph>Move Up</emph> icon, the numbers will be adjusted to the current order. <switchinline select="appl"><caseinline select="WRITER">The <emph>Move Up</emph> icon is only visible when the cursor is positioned in a bulleted or numbered list.
-</caseinline></switchinline><switchinline select="appl"><caseinline select="IMPRESS">The <emph>Move Up</emph> icon appears on the <emph>Text Formatting</emph> bar when you use the outline view.
-</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3155555" xml-lang="en-US">This function can be called by pressing <switchinline select="sys"><caseinline select="MAC"><emph>Command</emph></caseinline><defaultinline><emph>Ctrl</emph></defaultinline></switchinline>+<emph>Up Arrow</emph>.</paragraph>
+<paragraph role="paragraph" id="par_id3149283" xml-lang="en-US">If you have numbered paragraphs and use the <menuitem>Move</menuitem> <switchinline select="appl"><caseinline select="WRITER"><menuitem>Item </menuitem></caseinline></switchinline><menuitem>Up</menuitem> command, then the numbers are adjusted automatically to the current order.</paragraph> 
+<switch select="appl">
+<case select="WRITER">
+<paragraph role="paragraph" id="par_id681650030725110">The <menuitem>Move Item Up</menuitem> icon appears on the <link href="text/swriter/main0206.xhp" name="BulletNumberingBar"><menuitem>Bullets and Numbering</menuitem></link> bar.</paragraph>
+<paragraph role="paragraph" id="par_id3155555" xml-lang="en-US">The <menuitem>Move Item Up</menuitem> command is always active. This function can also be called by pressing <switchinline select="sys"><caseinline select="MAC"><keycode>Command</keycode></caseinline><defaultinline><keycode>Ctrl</keycode></defaultinline></switchinline>+<keycode>Alt</keycode>+<keycode>Up Arrow</keycode>.</paragraph>
+</case>
+<case select="IMPRESS">
+<paragraph role="paragraph" id="par_id171650031011213">The <menuitem>Move Up</menuitem> icon appears on the <menuitem>Outline</menuitem> bar.</paragraph>
+<paragraph role="paragraph" id="par_id411650030036986">The <menuitem>Move Up</menuitem> command is always active. This function can also be called by pressing <keycode>Alt+Shift+Up Arrow</keycode>.</paragraph>
+</case>
+<default>
+<comment>No shortcut keys or toolbars for CALC and DRAW</comment>
+</default>
+</switch>
 <section id="symove_up">
 <table id="tbl_id3155535">
   <tablerow>
@@ -45,7 +55,7 @@
       <paragraph role="paragraph" id="par_id3150774" xml-lang="en-US"><image id="img_id3149827" src="cmd/lc_moveup.svg" width="1cm" height="1cm"><alt id="alt_id3149827" xml-lang="en-US">Icon Move Up</alt></image></paragraph>
     </tablecell>
     <tablecell>
-      <paragraph role="paragraph" id="par_id3147243" xml-lang="en-US">Move Up</paragraph>
+      <paragraph role="paragraph" id="par_id3147243" xml-lang="en-US">Move <switchinline select="appl"><caseinline select="WRITER">Item</caseinline></switchinline> Up</paragraph>
     </tablecell>
   </tablerow>
 </table>
diff --git a/source/text/shared/02/06110000.xhp b/source/text/shared/02/06110000.xhp
index 2742173079..533c841c6a 100644
--- a/source/text/shared/02/06110000.xhp
+++ b/source/text/shared/02/06110000.xhp
@@ -31,12 +31,23 @@
 <section id="move_down">
 <bookmark xml-lang="en-US" branch="hid/.uno:OutlineDown" id="bm_id3154894" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:MoveDown" id="bm_id3149495" localize="false"/>
-<h1 id="hd_id3148520"><link href="text/shared/02/06110000.xhp" name="Move Down">Move Down</link></h1>
-<paragraph role="paragraph" id="par_id3154228" xml-lang="en-US"><ahelp hid=".">Positions the selected paragraph after the one below it.</ahelp></paragraph>
+<h1 id="hd_id3148520"><link href="text/shared/02/06110000.xhp" name="Move Down">Move<switchinline select="appl"><caseinline select="WRITER"> Item</caseinline></switchinline> Down</link></h1>
+<paragraph role="paragraph" id="par_id3154228" xml-lang="en-US"><ahelp hid=".">Moves the paragraph where the cursor is located, or selected paragraphs, to after the next paragraph.</ahelp></paragraph>
 </section>
-<paragraph role="paragraph" id="par_id3158405" xml-lang="en-US">If you have numbered paragraphs and click the <emph>Move Down</emph> icon, the numbers will be adjusted to the current order. <switchinline select="appl"><caseinline select="WRITER">The <emph>Move Down</emph> icon is only visible when the cursor is positioned in a bulleted or numbered list.
-</caseinline></switchinline><switchinline select="appl"><caseinline select="IMPRESS">The <emph>Move Down</emph> icon appears on the <emph>Text Formatting</emph> bar when you use the outline view.</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3149751" xml-lang="en-US">This function can be called by pressing <switchinline select="sys"><caseinline select="MAC"><emph>Command</emph></caseinline><defaultinline><emph>Ctrl</emph></defaultinline></switchinline>+<emph>Down Arrow</emph>.</paragraph>
+<paragraph role="paragraph" id="par_id3158405" xml-lang="en-US">If you have numbered paragraphs and use <menuitem>Move</menuitem><switchinline select="appl"><caseinline select="WRITER"> <menuitem>Item</menuitem></caseinline></switchinline> <menuitem>Down</menuitem>, then the numbers are adjusted automatically to the current order.</paragraph>
+<switch select="appl">
+<case select="WRITER">
+<paragraph role="paragraph" id="par_id431650033515260">The <menuitem>Move Item Down</menuitem> icon appears on the <link href="text/swriter/main0206.xhp" name="BulletNumberingBar"><menuitem>Bullets and Numbering</menuitem></link> bar.</paragraph>
+<paragraph role="paragraph" id="par_id3149751" xml-lang="en-US">The <menuitem>Move Item Down</menuitem> command is always active. This function can also be called by pressing <switchinline select="sys"><caseinline select="MAC"><keycode>Command</keycode></caseinline><defaultinline><keycode>Ctrl</keycode></defaultinline></switchinline>+<keycode>Alt</keycode>+<keycode>Down Arrow</keycode>.</paragraph>
+</case>
+<case select="IMPRESS">
+<paragraph role="paragraph" id="par_id571650033665947">The <menuitem>Move Down</menuitem> icon appears on the <menuitem>Outline</menuitem> bar.</paragraph>
+<paragraph role="paragraph" id="par_id121650033675563">The <menuitem>Move Down</menuitem> command is always active. This function can also be called by pressing <keycode>Alt+Shift+Down Arrow</keycode>.</paragraph>
+</case>
+<default>
+<comment>No shortcut keys or toolbars for CALC and DRAW.</comment>
+</default>
+</switch>
 <section id="symove_down">
 <table id="tbl_id3155535">
   <tablerow>
@@ -44,7 +55,7 @@
       <paragraph role="paragraph" id="par_id3156426" xml-lang="en-US"><image id="img_id3153577" src="cmd/lc_movedown.svg" width="1cm" height="1cm"><alt id="alt_id3153577" xml-lang="en-US">Icon Move Down</alt></image></paragraph>
     </tablecell>
     <tablecell>
-      <paragraph role="paragraph" id="par_id3145212" xml-lang="en-US">Move Down</paragraph>
+      <paragraph role="paragraph" id="par_id3145212" xml-lang="en-US">Move <switchinline select="appl"><caseinline select="WRITER">Item</caseinline></switchinline> Down</paragraph>
     </tablecell>
   </tablerow>
 </table>