AllLangHelp_swriter.mk | 1
source/text/swriter/01/05080000.xhp | 8 ++--
source/text/swriter/01/format_frame.xhp | 33 +++++++++++++++++++
source/text/swriter/01/format_object.xhp | 17 ++++++----
source/text/swriter/02/03210000.xhp | 42 ++++++++++++++-----------
source/text/swriter/02/03220000.xhp | 52 +++++++++++++++++--------------
source/text/swriter/main0105.xhp | 6 +--
7 files changed, 106 insertions(+), 53 deletions(-)
New commits:
commit 89e4b94cab3bc2ce743521cff019a9b8db7ddefd
Author: Olivier Hallot <olivier.hal...@libreoffice.org>
AuthorDate: Thu Aug 24 10:59:20 2023 -0300
Commit: Olivier Hallot <olivier.hal...@libreoffice.org>
CommitDate: Thu Aug 24 16:15:14 2023 +0200
tdf#155875 Tab'd UI cmds Writer/Format in Help(16)
+ refactoring
+ Writer Format menu (part 16)
+ fraems and link frames
Change-Id: I04e90e58bbaf4d59334fcb5f06aabb75bb572077
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/156054
Tested-by: Jenkins
Reviewed-by: Olivier Hallot <olivier.hal...@libreoffice.org>
diff --git a/AllLangHelp_swriter.mk b/AllLangHelp_swriter.mk
index c14075ea1c..bde68c9d3c 100644
--- a/AllLangHelp_swriter.mk
+++ b/AllLangHelp_swriter.mk
@@ -178,6 +178,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,swriter,\
helpcontent2/source/text/swriter/01/contentcontrol00 \
helpcontent2/source/text/swriter/01/accessibility_check \
helpcontent2/source/text/swriter/01/format_object \
+ helpcontent2/source/text/swriter/01/format_frame \
helpcontent2/source/text/swriter/01/goto \
helpcontent2/source/text/swriter/01/legacynumbering \
helpcontent2/source/text/swriter/01/mailmerge00 \
diff --git a/source/text/swriter/01/05080000.xhp
b/source/text/swriter/01/05080000.xhp
index 3e00b6baff..cd0e5bd31b 100644
--- a/source/text/swriter/01/05080000.xhp
+++ b/source/text/swriter/01/05080000.xhp
@@ -19,7 +19,7 @@
<helpdocument version="1.0">
<meta>
<topic id="textswriter0105080000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Object</title>
+<title id="tit">Object</title>
<filename>/text/swriter/01/05080000.xhp</filename>
</topic>
<history>
@@ -27,10 +27,10 @@
</history>
</meta>
<body>
-<bookmark xml-lang="en-US" branch="hid/.uno:FrameDialog" id="bm_id9776567"
localize="false"/>
-<paragraph role="paragraph" id="par_idN10594" xml-lang="en-US"
localize="false"><comment>Name is not related to UI, dialog is called by Format
- Image or Format - Frame, so name should be Frame / Image or we need two files
that are the same except for title</comment></paragraph>
+<bookmark branch="hid/.uno:FrameDialog" id="bm_id9776567" localize="false"/>
+<paragraph role="paragraph" id="par_idN10594" localize="false"><comment>Name
is not related to UI, dialog is called by Format - Image or Format - Frame, so
name should be Frame / Image or we need two files that are the same except for
title</comment></paragraph>
<h1 id="hd_id3150536">Object</h1>
-<paragraph role="paragraph" id="par_id3149352" xml-lang="en-US"><variable
id="objekttext"><ahelp hid=".uno:FrameDialog">Opens a dialog where you can
modify the properties of the selected object, for example, its size and
name.</ahelp>
+<paragraph role="paragraph" id="par_id3149352"><variable
id="objekttext"><ahelp hid=".uno:FrameDialog">Opens a dialog where you can
modify the properties of the selected object, for example, its size and
name.</ahelp>
</variable></paragraph>
<section id="howtoget">
<embed href="text/swriter/00/00000405.xhp#object_properties"/>
diff --git a/source/text/swriter/01/format_frame.xhp
b/source/text/swriter/01/format_frame.xhp
new file mode 100644
index 0000000000..3653686647
--- /dev/null
+++ b/source/text/swriter/01/format_frame.xhp
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<helpdocument version="1.0">
+ <!--
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ -->
+
+ <meta>
+ <topic id="textswriter01format_framexhp" indexer="include"
status="PUBLISH">
+ <title id="tit">Frame and Object</title>
+ <filename>/text/swriter/01/format_frame.xhp</filename>
+ </topic>
+</meta>
+<body>
+<bookmark id="bm_id371692882707232" branch="hid/.uno:FormatFrameMenu"
localize="false"/>
+<section id="FormatFrameMenu">
+ <h1 id="hd_id891692882707233"><variable id="h1"><link
href="text/swriter/01/format_frame.xhp">Frame and Object</link></variable></h1>
+ <paragraph role="paragraph" id="par_id951602977746649">Opens a submenu to
link and unlink frames, and edit properties of a selected frame.</paragraph>
+</section>
+<section id="howtoget">
+ <embed href="text/shared/00/00000004.xhp#from_menu_bar"/>
+ <paragraph role="paragraph" id="par_id401692882792548">Choose
<menuitem>Format - Frame and Object</menuitem>.</paragraph>
+</section>
+<embed href="text/swriter/02/03210000.xhp#link_frames"/>
+<embed href="text/swriter/02/03220000.xhp#unlink_frames"/>
+<h2 id="hd_id861692882970016"><link
href="text/swriter/01/05080000.xhp">Properties</link></h2>
+<paragraph role="paragraph" id="par_id51692883216990"
localize="false"><embedvar href="text/swriter/01/05080000.xhp#objekttext"
markup="ignore"/></paragraph>
+</body>
+</helpdocument>
diff --git a/source/text/swriter/01/format_object.xhp
b/source/text/swriter/01/format_object.xhp
index c03d61a4df..22320fa4be 100644
--- a/source/text/swriter/01/format_object.xhp
+++ b/source/text/swriter/01/format_object.xhp
@@ -19,7 +19,7 @@
<helpdocument version="1.0">
<meta>
<topic id="textswriter01format_objectxhp" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Text Box and Shape</title>
+<title id="tit" >Text Box and Shape</title>
<filename>/text/swriter/01/format_object.xhp</filename>
</topic>
<history>
@@ -28,15 +28,20 @@
</meta>
<body>
<section id="object">
-<bookmark xml-lang="en-US" branch="hid/.uno:DrawGraphicMenu" id="bm_id5739310"
localize="false"/>
-<h1 id="par_idN10548" xml-lang="en-US"><link
href="text/swriter/01/format_object.xhp">Text Box and Shape</link></h1>
-<paragraph role="paragraph" id="par_idN10558" xml-lang="en-US"><ahelp
hid=".">Opens a submenu to edit the properties of the selected textbox or
shape.</ahelp></paragraph>
+<bookmark branch="hid/.uno:DrawGraphicMenu" id="bm_id5739310"
localize="false"/>
+<bookmark branch="hid/.uno:FormatObjectMenu" id="bm_id301692832205444"
localize="false"/>
+<h1 id="par_idN10548" ><link href="text/swriter/01/format_object.xhp">Text Box
and Shape</link></h1>
+<paragraph role="paragraph" id="par_idN10558" ><ahelp hid=".">Opens a submenu
to edit the properties of the selected textbox or shape.</ahelp></paragraph>
+</section>
+<section id="howtoget">
+ <embed href="text/shared/00/00000004.xhp#from_menu_bar"/>
+ <paragraph role="paragraph" id="par_id201692832345816">Choose
<menuitem>Format - Text Box and Shape</menuitem>.</paragraph>
</section>
<embed href="text/shared/01/05230000.xhp#position_and_size"/>
<embed href="text/shared/01/05200000.xhp#line"/>
<embed href="text/shared/01/05210000.xhp#area"/>
<embed href="text/shared/01/05990000.xhp#text"/><comment>Text
Attributes</comment>
-<h2 id="par_id9466841" xml-lang="en-US"><link
href="text/shared/01/05280000.xhp">Fontwork</link></h2>
-<paragraph role="paragraph" id="par_id2874538" xml-lang="en-US">Edits Fontwork
effects of the selected object that has been created with the previous Fontwork
dialog.</paragraph>
+<h2 id="par_id9466841" ><link
href="text/shared/01/05280000.xhp">Fontwork</link></h2>
+<paragraph role="paragraph" id="par_id2874538" >Edits Fontwork effects of the
selected object that has been created with the previous Fontwork
dialog.</paragraph>
</body>
</helpdocument>
diff --git a/source/text/swriter/02/03210000.xhp
b/source/text/swriter/02/03210000.xhp
index 631fd0cdc3..2a157899cc 100644
--- a/source/text/swriter/02/03210000.xhp
+++ b/source/text/swriter/02/03210000.xhp
@@ -19,7 +19,7 @@
<helpdocument version="1.0">
<meta>
<topic id="textswriter0203210000xml" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">Link Frames</title>
+<title id="tit">Link Frames</title>
<filename>/text/swriter/02/03210000.xhp</filename>
</topic>
<history>
@@ -27,29 +27,37 @@
</history>
</meta>
<body>
+<bookmark branch="hid/.uno:ChainFrames" id="bm_id3143228" localize="false"/>
+<bookmark branch="index" id="bm_id641692884203505">
+<bookmark_value>linking;frames</bookmark_value>
+<bookmark_value>frames;linking</bookmark_value>
+</bookmark>
<section id="link_frames">
-<bookmark branch="hid/.uno:ChainFrames" xml-lang="en-US" id="bm_id3143228"
localize="false"/>
<h1 id="hd_id3148869"><link href="text/swriter/02/03210000.xhp">Link
Frames</link></h1>
-<paragraph role="paragraph" id="par_id3149873" xml-lang="en-US"><ahelp
hid=".uno:ChainFrames" visibility="visible">Links the selected frame to the
next frame.</ahelp> The text automatically flows from one frame to
another.</paragraph>
+<paragraph role="paragraph" id="par_id3149873"><ahelp hid=".uno:ChainFrames"
visibility="visible">Links the selected frame to the next frame.</ahelp> The
text automatically flows from one frame to another.</paragraph>
</section>
<section id="howtoget">
-<paragraph role="paragraph" id="par_id721613395973296">Choose <menuitem>Format
- Frame and Object - Link Frames</menuitem>.</paragraph>
-<paragraph role="paragraph" id="par_id531613396047070">On the
<emph>Format</emph> bar, click the <emph>Link Frames</emph> icon.</paragraph>
-</section>
- <section id="sylink_frames">
- <table id="tbl_id3155624">
- <tablerow>
- <tablecell>
- <paragraph role="paragraph" id="par_id3145244" xml-lang="en-US"><image
src="cmd/sc_chainframes.png" id="img_id3148771" width="1cm" height="1cm"><alt
xml-lang="en-US" id="alt_id3148771">Icon Link Frames</alt></image></paragraph>
- </tablecell>
- <tablecell>
- <paragraph role="paragraph" id="par_id3149288" xml-lang="en-US">Link
Frames</paragraph>
- </tablecell>
- </tablerow>
- </table>
+ <embed href="text/shared/00/00000004.xhp#from_menu_bar"/>
+ <paragraph role="paragraph" id="par_id721613395973296">Choose
<menuitem>Format - Frame and Object - Link Frames</menuitem>.</paragraph>
+ <embed href="text/shared/00/00000004.xhp#from_tabUI"/>
+ <paragraph role="paragraph" id="par_id291692884587358">Choose
<menuitem>Object - Link Frames</menuitem>.</paragraph>
+ <embed href="text/shared/00/00000004.xhp#from_toolbars"/>
+ <section id="sylink_frames">
+ <table id="tbl_id3155624">
+ <tablerow>
+ <tablecell>
+ <paragraph role="paragraph" id="par_id3145244"><image
src="cmd/lc_chainframes.svg" id="img_id3148771" width="1cm" height="1cm"><alt
id="alt_id3148771">Icon Link Frames</alt></image></paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph role="paragraph" id="par_id3149288">Link
Frames</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
+ </section>
</section>
<section id="relatedtopics">
<embed href="text/swriter/guide/text_frame.xhp#text_frame"/>
+ <paragraph role="paragraph" id="par_id131692884364682"><link
href="text/swriter/01/format_frame.xhp">Frame and Object menu</link></paragraph>
</section>
</body>
</helpdocument>
diff --git a/source/text/swriter/02/03220000.xhp
b/source/text/swriter/02/03220000.xhp
index 459e40f1f1..98e2f1c350 100644
--- a/source/text/swriter/02/03220000.xhp
+++ b/source/text/swriter/02/03220000.xhp
@@ -1,6 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
<!--
* This file is part of the LibreOffice project.
*
@@ -18,13 +16,10 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
-
-
-
<helpdocument version="1.0">
<meta>
<topic id="textswriter0203220000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Unlink Frames</title>
+<title id="tit">Unlink Frames</title>
<filename>/text/swriter/02/03220000.xhp</filename>
</topic>
<history>
@@ -32,28 +27,39 @@
</history>
</meta>
<body>
-<section id="unlink_frames">
-<bookmark xml-lang="en-US" branch="index"
id="bm_id3151188"><bookmark_value>frames;unlinking</bookmark_value>
+<bookmark branch="index" id="bm_id3151188">
+<bookmark_value>frames;unlinking</bookmark_value>
<bookmark_value>unlinking frames</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/.uno:UnhainFrames" id="bm_id5787098"
localize="false"/>
+<bookmark branch="hid/.uno:UnhainFrames" id="bm_id5787098" localize="false"/>
+<section id="unlink_frames">
<h1 id="hd_id3151188"><link href="text/swriter/02/03220000.xhp">Unlink
Frames</link></h1>
-<paragraph role="paragraph" id="par_id3145412" xml-lang="en-US"><ahelp
hid=".uno:UnhainFrames">Breaks the link between two frames.</ahelp> You can
only break the link that extends from the selected frame to the target
frame.</paragraph>
+<paragraph role="paragraph" id="par_id3145412"><ahelp
hid=".uno:UnhainFrames">Breaks the link between two frames.</ahelp> You can
only break the link that extends from the selected frame to the target
frame.</paragraph>
+</section>
+<section id="howtoget">
+ <embed href="text/shared/00/00000004.xhp#from_menu_bar"/>
+ <paragraph role="paragraph" id="par_id721613395973296">Choose
<menuitem>Format - Frame and Object - Unlink Frames</menuitem>.</paragraph>
+ <embed href="text/shared/00/00000004.xhp#from_tabUI"/>
+ <paragraph role="paragraph" id="par_id291692884587358">Choose
<menuitem>Object - Unlink Frames</menuitem>.</paragraph>
+ <embed href="text/shared/00/00000004.xhp#from_toolbars"/>
+ <section id="syunlink_frames">
+ <table id="tbl_id3153638">
+ <tablerow>
+ <tablecell>
+ <paragraph role="paragraph"
id="par_id3155903">
+ <image id="img_id3149687"
src="cmd/lc_unhainframes.svg" width="5.64mm" height="5.64mm"><alt
id="alt_id3149687">Icon Unlink Frames</alt></image></paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph role="paragraph"
id="par_id3155628">Unlink Frames</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
+ </section>
</section>
-<section id="syunlink_frames">
-<table id="tbl_id3153638">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3155903" xml-lang="en-US">
-<image id="img_id3149687" src="cmd/sc_unhainframes.png" width="5.64mm"
height="5.64mm"><alt id="alt_id3149687" xml-lang="en-US">Icon</alt>
- </image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3155628" xml-lang="en-US">Unlink
Frames</paragraph>
-</tablecell>
-</tablerow>
-</table>
+<section id="relatedtopics">
+ <embed href="text/swriter/guide/text_frame.xhp#text_frame"/>
+ <paragraph role="paragraph" id="par_id131692884364682"><link
href="text/swriter/01/format_frame.xhp">Frame and Object menu</link></paragraph>
</section>
</body>
</helpdocument>
diff --git a/source/text/swriter/main0105.xhp b/source/text/swriter/main0105.xhp
index b5fffc9064..0d94f70315 100644
--- a/source/text/swriter/main0105.xhp
+++ b/source/text/swriter/main0105.xhp
@@ -64,9 +64,9 @@
<embed href="text/shared/menu/submenu_image.xhp#submenu_image"/>
-<embed href="text/swriter/01/format_object.xhp#object"/><comment>Text Box and
Shape</comment>
-<h2 id="hd_id881602977719329">Frame and Object</h2>
-<paragraph role="paragraph" id="par_id951602977746649">Opens a submenu to link
and unlink frames, and edit properties of a selected
frame.</paragraph><comment>When a submenu is made for Frame and Object, then
the heading and text can be replaced with the embed.</comment>
+<embed href="text/swriter/01/format_object.xhp#object"/>
+<embed href="text/swriter/01/format_frame.xhp#FormatFrameMenu"/>
+
<embed href="text/shared/01/05190000.xhp#name_head"/>
<embed href="text/shared/01/05190100.xhp#description_head"/>
<embed href="text/shared/01/05260000.xhp#anchoring"/>
