tdf#149085 Protect section in Writer object properties moved to

Position and Size tab.

I removed the <ahelp> tags as the .ui file already has extended tips defined.

Also update the label Automatic to AutoSize to match current UI.

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

2 files changed, 15 insertions, 14 deletions

diff --git a/source/text/swriter/01/05060100.xhp b/source/text/swriter/01/05060100.xhp
index e5a0f42a5a..b77bbd1b32 100644
--- a/source/text/swriter/01/05060100.xhp
+++ b/source/text/swriter/01/05060100.xhp
@@ -67,9 +67,22 @@
   <note id="par_id3149102">This option is not available for frames.</note>
   <bookmark branch="hid/modules/swriter/ui/frmtypepage/autoheight" id="bm_id3151255" localize="false"/>
   <bookmark branch="hid/modules/swriter/ui/frmtypepage/autowidth" id="bm_id358592" localize="false"/>
-  <h3 id="hd_id3149824">Automatic</h3>
+  <h3 id="hd_id3149824">AutoSize</h3>
   <paragraph role="paragraph" id="par_id3151262"><ahelp hid="modules/swriter/ui/frmtypepage/autoheight">Automatically adjusts the width or height of a frame to match the contents of the frame. If you want, you can specify a minimum width or minimum height for the frame.</ahelp></paragraph>
-  <note id="par_id3152773">The <emph>Automatic</emph> option is only available when you select a frame.</note>
+  <note id="par_id3152773">The <emph>AutoSize</emph> option is only available when you select a frame.</note>
+
+  <h2 id="hd_id3143280">Protect</h2>
+  <paragraph role="paragraph" id="par_id3154834">Specifies protection options for the selected item.</paragraph>
+  <bookmark branch="hid/modules/swriter/ui/frmtypepage/protectcontent" id="bm_id3149098" localize="false"/>
+  <h3 id="hd_id3149820">Contents</h3>
+  <paragraph role="paragraph" id="par_id3149105">Prevents changes to the contents of the selected item.</paragraph>
+  <paragraph role="paragraph" id="par_id3147099">You can still copy the contents of the selected item.</paragraph>
+  <bookmark branch="hid/modules/swriter/ui/frmtypepage/protectframe" id="bm_id3147218" localize="false"/>
+  <h3 id="hd_id3148979">Position</h3>
+  <paragraph role="paragraph" id="par_id3147225">Locks the position of the selected item in the current document.</paragraph>
+  <bookmark branch="hid/modules/swriter/ui/frmtypepage/protectsize" id="bm_id3153640" localize="false"/>
+  <h3 id="hd_id3153629">Size</h3>
+  <paragraph role="paragraph" id="par_id3147576">Locks the size of the selected item.</paragraph>
 
   <section id="AnchorHelp">
     <h2 id="hd_id3155144">Anchor</h2>
diff --git a/source/text/swriter/01/05060900.xhp b/source/text/swriter/01/05060900.xhp
index ddb0ddc9f9..8b0656b9f5 100644
--- a/source/text/swriter/01/05060900.xhp
+++ b/source/text/swriter/01/05060900.xhp
@@ -56,18 +56,6 @@
 <bookmark branch="hid/modules/swriter/ui/frmaddpage/next" id="bm_id3155185" localize="false"/>
 <h3 id="hd_id3159198">Next link</h3>
 <paragraph role="paragraph" id="par_id3149485"><ahelp hid="modules/swriter/ui/frmaddpage/next">Displays the frame that comes after the selected frame in a linked sequence. To add or change the next link, select a name from the list. If you are a linking frames, the target frame must be empty.</ahelp></paragraph>
-<h2 id="hd_id3143280">Protect</h2>
-<paragraph role="paragraph" id="par_id3154834">Specifies protection options for the selected item.</paragraph>
-<bookmark branch="hid/modules/swriter/ui/frmaddpage/protectcontent" id="bm_id3149098" localize="false"/>
-<h3 id="hd_id3149820">Contents</h3>
-<paragraph role="paragraph" id="par_id3149105"><ahelp hid="modules/swriter/ui/frmaddpage/protectcontent">Prevents changes to the contents of the selected item.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id3147099">You can still copy the contents of the selected item.</paragraph>
-<bookmark branch="hid/modules/swriter/ui/frmaddpage/protectframe" id="bm_id3147218" localize="false"/>
-<h3 id="hd_id3148979">Position</h3>
-<paragraph role="paragraph" id="par_id3147225"><ahelp hid="modules/swriter/ui/frmaddpage/protectframe">Locks the position of the selected item in the current document.</ahelp></paragraph>
-<bookmark branch="hid/modules/swriter/ui/frmaddpage/protectsize" id="bm_id3153640" localize="false"/>
-<h3 id="hd_id3153629">Size</h3>
-<paragraph role="paragraph" id="par_id3147576"><ahelp hid="modules/swriter/ui/frmaddpage/protectsize">Locks the size of the selected item.</ahelp></paragraph>
 <h2 id="hd_id3151028">Content alignment (frames only)</h2>
 <h3 id="hd_id671652134896150">Vertical alignment</h3>
 <paragraph role="paragraph" id="par_id3149164"><ahelp hid="modules/swriter/ui/frmaddpage/vertalign">Specifies the vertical alignment of the frame's content. Mainly it means text content, but it also affects tables and other objects anchored to the text area (anchored as character, to character or to paragraph), for example frames, graphics or drawings.</ahelp></paragraph>