source/text/shared/01/05230100.xhp | 10 ++++++++++
source/text/swriter/01/05060100.xhp | 16 +++++++++++++---
2 files changed, 23 insertions(+), 3 deletions(-)
New commits:
commit 42ded671522a4e62659b561b0c8ea67fef5b9cea
Author: Seth Chaiklin <sdc.bla...@youmail.dk>
AuthorDate: Mon Apr 11 14:49:08 2022 +0100
Commit: Seth Chaiklin <sdc.bla...@youmail.dk>
CommitDate: Tue May 3 00:08:00 2022 +0200
tdf#148485 add missing options for Vertical positioning
This patch started with the simple intent to add some
missing options to the "To" control in the Position section
of the the Position and Size dialog. However, problems were
discovered with the names of some of the options to be added,
as well as some of the existing options. This lead to
tdf#148591 and tdf#148519, which changed the labels for the
missing options mentioned in the OP for tdf#148485. Thanks to
Regina Henschel for essential help in understanding the regions
to which the labels are supposed to refer.
Using the new option labels, this patch adds
"Above page text area", "Below page text area" as "to" options
in the Vertical position section of the Position and Size dialog,
and "Frame text area" and "Entire frame" in both the Position
and Size dialog for Shape and the Type dialog for Image.
Because Above/Below text page area is not found in the Image dialog
for Writer, needed to add an additional section to
swriter/01/05060100.xhp (Image/Frame - Type tab), so that it is
possible to add the missing options (Above page text area,
Below page text area) to Position and Size help for Writer
(shared/01/05230100.xhp), but not have them be part of a section
that will be embedded in swriter/01/05060100.xhp (for Image/Frame -
Type tab).
swriter/01/05060100.xhp
* Corrected description of "to" control
+ Added "Available only..." for "Line of text"
* refactored to <note>
o All embedded to shared/01/05230100.xhp for Writer (Image - Type).
Change-Id: I9fffec30dd994d15aa9a7c9ef70dec01d63ed98f
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/132709
Tested-by: Jenkins
Reviewed-by: Seth Chaiklin <sdc.bla...@youmail.dk>
diff --git a/source/text/shared/01/05230100.xhp
b/source/text/shared/01/05230100.xhp
index 8ac052e9f..8085a1218 100644
--- a/source/text/shared/01/05230100.xhp
+++ b/source/text/shared/01/05230100.xhp
@@ -149,6 +149,16 @@
<bookmark xml-lang="en-US" branch="hid/cui/ui/swpossizepage/vertanchor"
id="bm_id1466719" localize="false"/>
<bookmark xml-lang="en-US"
branch="hid/cui/ui/swpossizepage/followtextflow" id="bm_id4516434"
localize="false"/>
<embed href="text/swriter/01/05060100.xhp#PositionHelp_2"/>
+ <comment>2022-05-01: Following two options are not in Image (Type tab for
Writer), so not part of sections embedded here.</comment>
+ <list type="unordered">
+ <listitem>
+ <paragraph id="par_id956728219000973" role="listitem"><menuitem>Below
page text area</menuitem>: the bottom edge of the page text area to the bottom
edge of the page.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph id="par_id69163053457957" role="listitem"><menuitem>Above
page text area</menuitem>: the top edge of the page to the top of the page text
area.</paragraph>
+ </listitem>
+ </list>
+ <embed href="text/swriter/01/05060100.xhp#PositionHelp_3"/>
<embed href="text/swriter/01/05060100.xhp#keep_inside_text_bnd"/>
</case>
<default>
diff --git a/source/text/swriter/01/05060100.xhp
b/source/text/swriter/01/05060100.xhp
index ca9cad0bb..20224d16c 100644
--- a/source/text/swriter/01/05060100.xhp
+++ b/source/text/swriter/01/05060100.xhp
@@ -145,13 +145,13 @@
<bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/frmtypepage/vertpos" id="bm_id3145321"
localize="false"/>
<h3 id="hd_id3145310" xml-lang="en-US">Vertical</h3>
<paragraph role="paragraph" id="par_id3150161" xml-lang="en-US"><ahelp
hid=".">Select the vertical alignment option for the object.</ahelp></paragraph>
- <paragraph role="note" id="par_id3150463" xml-lang="en-US">If you anchor
an object to a frame with a fixed height, only the "Bottom" and "Center"
alignment options are available.</paragraph>
+ <note id="par_id3150463" xml-lang="en-US">If you anchor an object to a
frame with a fixed height, only the "Bottom" and "Center" alignment options are
available.</note>
<bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/frmtypepage/byvert" id="bm_id3156123"
localize="false"/>
<h3 id="hd_id3154724" xml-lang="en-US">by</h3>
<paragraph role="paragraph" id="par_id3156130" xml-lang="en-US"><ahelp
hid=".">Enter the amount of space to leave between the top edge of the selected
object and the reference point that you select in the <emph>To</emph>
box.</ahelp> This option is only available if you select "From Top" or "From
Bottom" (as character) in the <emph>Vertical</emph> box. </paragraph>
<bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/frmtypepage/vertanchor" id="bm_id3150923"
localize="false"/>
<h3 id="hd_id3150912" xml-lang="en-US">to</h3>
- <paragraph role="paragraph" id="par_id3155075" xml-lang="en-US"><ahelp
hid=".">Select the reference point for the selected vertical alignment
option.</ahelp> The following options are available:</paragraph>
+ <paragraph role="paragraph" id="par_id3155075" xml-lang="en-US"><ahelp
hid=".">Select the region or reference point for the vertical
alignment.</ahelp> The object can be positioned in relation to the following
regions or reference points:</paragraph>
<list type="unordered">
<listitem>
<paragraph id="par_id551629212019498"
role="listitem"><emph>Margin:</emph> Depending on the anchoring type, the
object is positioned considering the space between the top margin and the
character ("To character" anchoring) or bottom edge of the paragraph ("To
paragraph" anchoring) where the anchor is placed.</paragraph>
@@ -165,11 +165,15 @@
<listitem>
<paragraph id="par_id691629212020466" role="listitem"><emph>Page text
area:</emph> the object is positioned considering the full height available for
text, from top to bottom margins.</paragraph>
</listitem>
+ </list>
+ </section>
+ <section id="PositionHelp_3">
+ <list type="unordered">
<listitem>
<paragraph id="par_id951629212020860"
role="listitem"><emph>Character:</emph> the object is positioned considering
the vertical space used by the character.</paragraph>
</listitem>
<listitem>
- <paragraph id="par_id631629212021233" role="listitem"><emph>Line of
text:</emph> the object is positioned considering the height of the line of
text where the anchor is placed.</paragraph>
+ <paragraph id="par_id631629212021233" role="listitem"><menuitem>Line
of text</menuitem>: available only for "To character" anchoring, the object is
positioned considering the height of the line of text where the anchor is
placed.</paragraph>
</listitem>
<listitem>
<paragraph id="par_id631629220309961"
role="listitem"><emph>Baseline:</emph> available only for "As character"
anchoring, this option will position the object considering the text baseline
over which all characters are placed.</paragraph>
@@ -177,6 +181,12 @@
<listitem>
<paragraph id="par_id811629220310472"
role="listitem"><emph>Row:</emph> available only for "As character" anchoring,
this option will position the object considering the height of the row where
the anchor is placed.</paragraph>
</listitem>
+ <listitem>
+ <paragraph id="par_id450625620317357" role="listitem"><menuitem>Entire
frame</menuitem>: available only for "To frame" anchoring, the outer edges of
the frame.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph id="par_id341625620317835" role="listitem"><menuitem>Frame
text area</menuitem>: available only for "To frame" anchoring, the text area of
the frame.</paragraph>
+ </listitem>
</list>
<embed href="text/swriter/01/05060100.xhp#anchor_tip"/>
<embed href="text/swriter/01/05060100.xhp#preview_tip"/>
