AllLangHelp_swriter.mk | 4
source/auxiliary/swriter.tree | 1
source/text/swriter/00/formmenu.xhp | 28 +++
source/text/swriter/01/contentcontrol00.xhp | 114 ++++++++----
source/text/swriter/01/contentcontrol01.xhp | 38 ----
source/text/swriter/guide/contentcontrols.xhp | 181 ++++++++++++++++++++
source/text/swriter/main0120.xhp | 2
source/text/swriter/menu/contentcontrol_submenu.xhp | 59 ++++++
8 files changed, 348 insertions(+), 79 deletions(-)
New commits:
commit fa2f89b91f8f06c44c50b800762ee47006402ddd
Author: Olivier Hallot <olivier.hal...@libreoffice.org>
AuthorDate: Tue Jan 3 15:01:26 2023 -0300
Commit: Olivier Hallot <olivier.hal...@libreoffice.org>
CommitDate: Wed Jan 4 20:49:57 2023 +0000
tdf#152296 Content Controls Help Pages reviewed
- Added content control user guide
- Merged control properties pages
- New menu commands
- Entry in Contents tree
Change-Id: If4b550317c1d4cae3a06d8363058a7f3214621a9
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/144992
Tested-by: Jenkins
Reviewed-by: Olivier Hallot <olivier.hal...@libreoffice.org>
diff --git a/AllLangHelp_swriter.mk b/AllLangHelp_swriter.mk
index 0805145d64..11cd361484 100644
--- a/AllLangHelp_swriter.mk
+++ b/AllLangHelp_swriter.mk
@@ -24,6 +24,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,swriter,\
helpcontent2/source/text/swriter/00/00000404 \
helpcontent2/source/text/swriter/00/00000405 \
helpcontent2/source/text/swriter/00/00000406 \
+ helpcontent2/source/text/swriter/00/formmenu \
helpcontent2/source/text/swriter/00/stylesmenu \
helpcontent2/source/text/swriter/01/01120000 \
helpcontent2/source/text/swriter/01/01150000 \
@@ -207,7 +208,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,swriter,\
helpcontent2/source/text/swriter/01/title_page \
helpcontent2/source/text/swriter/01/watermark \
helpcontent2/source/text/swriter/01/contentcontrol00 \
- helpcontent2/source/text/swriter/01/contentcontrol01 \
helpcontent2/source/text/swriter/02/02110000 \
helpcontent2/source/text/swriter/02/03210000 \
helpcontent2/source/text/swriter/02/03220000 \
@@ -282,6 +282,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,swriter,\
helpcontent2/source/text/swriter/guide/chapter_numbering \
helpcontent2/source/text/swriter/guide/conditional_text \
helpcontent2/source/text/swriter/guide/conditional_text2 \
+ helpcontent2/source/text/swriter/guide/contentcontrols \
helpcontent2/source/text/swriter/guide/delete_from_dict \
helpcontent2/source/text/swriter/guide/dragdroptext \
helpcontent2/source/text/swriter/guide/even_odd_sdw \
@@ -423,6 +424,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,swriter,\
helpcontent2/source/text/swriter/menu/insert_footnote_endnote \
helpcontent2/source/text/swriter/menu/insert_frame \
helpcontent2/source/text/swriter/menu/submenu_more_breaks \
+ helpcontent2/source/text/swriter/menu/contentcontrol_submenu \
helpcontent2/source/text/swriter/mailmergetoolbar \
helpcontent2/source/text/swriter/track_changes_toolbar \
helpcontent2/source/text/swriter/navigate_toolbar \
diff --git a/source/auxiliary/swriter.tree b/source/auxiliary/swriter.tree
index 9c1433ce6a..879dea2898 100644
--- a/source/auxiliary/swriter.tree
+++ b/source/auxiliary/swriter.tree
@@ -149,6 +149,7 @@
<topic id="swriter/text/swriter/guide/fields.xhp">About Fields</topic>
<topic id="swriter/text/swriter/guide/fields_date.xhp">Inserting a Fixed
or Variable Date Field</topic>
<topic id="swriter/text/swriter/guide/field_convert.xhp">Converting a
Field into Text</topic>
+ <topic id="swriter/text/swriter/guide/contentcontrols.xhp">Using Content
Controls</topic>
</node>
<node id="0211" title="Calculating in Text Documents">
<topic
id="swriter/text/swriter/guide/calculate_multitable.xhp">Calculating Across
Tables</topic>
diff --git a/source/text/swriter/00/formmenu.xhp
b/source/text/swriter/00/formmenu.xhp
new file mode 100644
index 0000000000..bec090d72f
--- /dev/null
+++ b/source/text/swriter/00/formmenu.xhp
@@ -0,0 +1,28 @@
+<?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="formmenu" indexer="include" status="PUBLISH">
+ <title id="tit" xml-lang="en-US">The Form Menu</title>
+ <filename>/text/swriter/00/formmenu.xhp</filename>
+ </topic>
+</meta>
+<body>
+ <paragraph role="paragraph" id="par_id941529884998705"
xml-lang="en-US"><variable id="rchtxt">Choose <menuitem>Form - Content Control
- Insert Rich Text</menuitem></variable>.</paragraph>
+ <paragraph role="paragraph" id="par_id181672746735191"><variable
id="plntxt">Choose <menuitem>Form - Content Control - Insert Plain
Text</menuitem>.</variable></paragraph>
+ <paragraph role="paragraph" id="par_id661672746740280"><variable
id="pctr">Choose <menuitem>Form - Content Control - Insert
Picture</menuitem>.</variable></paragraph>
+ <paragraph role="paragraph" id="par_id311672746743964"><variable
id="chkbx">Choose <menuitem>Form - Content Control - Insert Check
Box</menuitem>.</variable></paragraph>
+ <paragraph role="paragraph" id="par_id301672746748847"><variable
id="cmbbx">Choose <menuitem>Form - Content Control - Insert Combo
Box</menuitem>.</variable></paragraph>
+ <paragraph role="paragraph" id="par_id981672746753368"><variable
id="drpdwn">Choose <menuitem>Form - Content Control - Insert Drop-down
List</menuitem>.</variable></paragraph>
+ <paragraph role="paragraph" id="par_id71672746757270"><variable
id="dt">Choose <menuitem>Form - Content Control - Insert
Date</menuitem>.</variable></paragraph>
+ <paragraph role="paragraph" id="par_id121672746761166"><variable
id="prop">Choose <menuitem>Form - Content Control - Content Control
Properties</menuitem>.</variable></paragraph>
+</body>
+</helpdocument>
diff --git a/source/text/swriter/01/contentcontrol00.xhp
b/source/text/swriter/01/contentcontrol00.xhp
index 46ccac8266..82cd1bd365 100644
--- a/source/text/swriter/01/contentcontrol00.xhp
+++ b/source/text/swriter/01/contentcontrol00.xhp
@@ -1,44 +1,80 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.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/.
+*
+* This file incorporates work covered by the following license notice:
+*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements. See the NOTICE file distributed
+* with this work for additional information regarding copyright
+* ownership. The ASF licenses this file to you under the Apache
+* License, Version 2.0 (the "License"); you may not use this file
+* 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="textswriter01contentcontrol00xml" indexer="include"
status="PUBLISH">
-<title id="tit" xml-lang="en-US">Content Control Properties</title>
-<filename>/text/swriter/01/contentcontrol00.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="contentcontrol">
-<bookmark xml-lang="en-US" branch="hid/.uno:ContentControlProperties"
id="bm_id9926450" localize="false"/>
-<bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/contentcontroldlg/ContentControlDialog"
id="bm_id1926107" localize="false"/>
-<bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/contentcontroldlg/@@nowidget@@"
id="bm_id1926108" localize="false"/>
-<paragraph role="heading" id="par_idN10549" xml-lang="en-US" level="1"><link
href="text/swriter/01/contentcontrol00.xhp">Content Control
Properties</link></paragraph>
-<paragraph role="paragraph" id="par_idN10559" xml-lang="en-US">Allows setting
various properties on the content control which is under the current
cursor.</paragraph>
-<paragraph role="heading" id="par_idN10550" xml-lang="en-US"
level="2">General</paragraph>
-<paragraph role="paragraph" id="par_idN10560" xml-lang="en-US">Content is
placeholder text: means that the current content is considered to be
placeholder text and will be pre-selected when clicking into the content
control, to help replacing the placeholder with actual content.</paragraph>
-<paragraph role="heading" id="par_idN10551" xml-lang="en-US" level="2">Check
Box</paragraph>
-<paragraph role="paragraph" id="par_idN10561" xml-lang="en-US">Checked
character: this character is used when the checkbox is ticked.</paragraph>
-<paragraph role="paragraph" id="par_idN10562" xml-lang="en-US">Unchecked
character: this character is used when the checkbox is unticked.</paragraph>
-<paragraph role="heading" id="par_idN10552" xml-lang="en-US" level="2">List
Items</paragraph>
-<paragraph role="paragraph" id="par_idN10563" xml-lang="en-US">This frame
lists existing list items, and allows the creation, modification and deletion
of them.</paragraph>
-<paragraph role="heading" id="par_idN10553" xml-lang="en-US" level="2">Date
Format</paragraph>
-<paragraph role="paragraph" id="par_idN10564" xml-lang="en-US">Once a date is
picked for a date content control, this date format will be used to format it
before it's inserted into the content control as a string.</paragraph>
-</section>
+ <meta>
+ <topic id="textswriter01contentcontrol00xml" indexer="include"
status="PUBLISH">
+ <title id="tit" xml-lang="en-US">Content Control Properties</title>
+ <filename>/text/swriter/01/contentcontrol00.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <bookmark xml-lang="en-US" branch="index" id="bm_id401672741265611">
+<bookmark_value>content control;properties</bookmark_value>
+<bookmark_value>checkbox;content control properties</bookmark_value>
+<bookmark_value>date;content control properties</bookmark_value>
+<bookmark_value>combo box;content control properties</bookmark_value>
+<bookmark_value>drop-down list;content control properties</bookmark_value>
+<bookmark_value>text;content control properties</bookmark_value>
+<bookmark_value>rich text;content control properties</bookmark_value>
+ </bookmark>
+ <section id="contentcontrol">
+ <bookmark xml-lang="en-US" branch="hid/.uno:ContentControlProperties"
id="bm_id9926450" localize="false"/>
+ <bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/contentcontroldlg/ContentControlDialog"
id="bm_id1926107" localize="false"/>
+ <bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/contentcontroldlg/@@nowidget@@"
id="bm_id1926108" localize="false"/>
+ <h1 id="par_idN10549"><link
href="text/swriter/01/contentcontrol00.xhp">Content Control
Properties</link></h1>
+ <paragraph role="paragraph" id="par_idN10559" xml-lang="en-US">Allows
setting various properties on the content control which is under the current
cursor.</paragraph>
+ </section>
+ <h2 id="par_idN10550">General Properties</h2>
+ <bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/contentcontroldlg/showing_place_holder"
id="bm_id941672740067884" localize="false"/>
+ <h3 id="hd_id151672713558681">Content is placeholder text</h3>
+ <paragraph role="paragraph" id="par_idN10560" xml-lang="en-US">The current
content is considered to be placeholder text and will be pre-selected when
clicking into the content control, to help replacing the placeholder with
actual content.</paragraph>
+ <bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/contentcontroldlg/aliasentry"
id="bm_id131672739978033" localize="false"/>
+ <h3 id="hd_id281672713587234">Title</h3>
+ <paragraph role="paragraph" id="par_id251672714173306">Insert a title for
the control. The title is displayed above the control when the cursor is in the
control. Click on the title to open the control properties dialog.</paragraph>
+ <bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/contentcontroldlg/tagentry"
id="bm_id661672740017424" localize="false"/>
+ <h3 id="hd_id991672713592194">Tag</h3>
+ <paragraph role="paragraph" id="par_id61672714338838">Tags serve a similar
purpose. A tag is a machine-readable key or identifier unique within the
document. Once the form is filled in, an external program can extract the
information from the document, by searching for the tags contents.</paragraph>
+ <h2 id="par_idN10551">Check Box Properties</h2>
+ <bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/contentcontroldlg/checkboxcheckedentry"
id="bm_id811672740267583" localize="false"/>
+ <h3 id="hd_id931672714588196">Checked character</h3>
+ <paragraph role="paragraph" id="par_idN10561" xml-lang="en-US">Character
used when the checkbox is checked. Click the <widget>Select</widget> button to
open the <link href="text/shared/01/04100000.xhp">Special Character</link>
dialog.</paragraph>
+ <bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/contentcontroldlg/checkboxuncheckedentry"
id="bm_id841672740306234" localize="false"/>
+ <h3 id="hd_id471672714593517">Unchecked character</h3>
+ <paragraph role="paragraph" id="par_idN10562" xml-lang="en-US">Character
used when the checkbox is unchecked. Click the <widget>Select</widget> button
to open the <link href="text/shared/01/04100000.xhp">Special Character</link>
dialog.</paragraph>
+ <bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/contentcontrollistitemdlg/ContentControlListItemDialog"
id="bm_id1926107" localize="false"/>
+ <bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/contentcontroldlg/listitems"
id="bm_id671672740541491" localize="false"/>
+ <h2 id="hd_id891672715583359">Combo Box and Drop-down List Item
Properties</h2>
+ <bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/contentcontrollistitemdlg/displayname"
id="bm_id671672740441491" localize="false"/>
+ <h3 id="hd_id391672715619447">Display Name</h3>
+ <paragraph role="paragraph" id="par_id781672715666970">A human-friendly
name, describing the list item.</paragraph>
+ <bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/contentcontrollistitemdlg/value"
id="bm_id671673740441491" localize="false"/>
+ <h3 id="hd_id111672715628738">Value</h3>
+ <paragraph role="paragraph" id="par_id371672715679904">A machine-friendly
name, describing the list item.</paragraph>
+ <h3 id="hd_id221672738649434">Add, Modify and Remove</h3>
+ <paragraph role="paragraph" id="par_id931672738656225">Respectively, adds,
moves and removes items in the list.</paragraph>
+ <h3 id="hd_id621672738660997">Move Up and Move Down</h3>
+ <paragraph role="paragraph" id="par_id701672738703799">Respectively moves
items up and down in the list, to reorder the list display.</paragraph>
+ <bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/contentcontroldlg/dateframe" id="bm_id1026107"
localize="false"/>
+ <h2 id="par_idN10553">Date Format</h2>
+ <paragraph role="paragraph" id="par_idN10564" xml-lang="en-US">Select the
date format to display the date of the date content control.</paragraph>
+ <section id="relatedtopics">
+ <paragraph localize="false" role="paragraph"
id="par_id381672743276267"><embedvar
href="text/swriter/guide/contentcontrols.xhp#h1" markup="ignore"/></paragraph>
+ </section>
</body>
</helpdocument>
diff --git a/source/text/swriter/01/contentcontrol01.xhp
b/source/text/swriter/01/contentcontrol01.xhp
deleted file mode 100644
index 9faa6ef72c..0000000000
--- a/source/text/swriter/01/contentcontrol01.xhp
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * 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="textswriter01contentcontrol01xml" indexer="include"
status="PUBLISH">
-<title id="tit" xml-lang="en-US">Content Control List Item Properties</title>
-<filename>/text/swriter/01/contentcontrol01.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="contentcontrollistitem">
-<bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/contentcontrollistitemdlg/ContentControlListItemDialog"
id="bm_id1926107" localize="false"/>
-<bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/contentcontrollistitemdlg/@@nowidget@@"
id="bm_id1926108" localize="false"/>
-<paragraph role="heading" id="par_idN10549" xml-lang="en-US" level="1"><link
href="text/swriter/01/contentcontrol01.xhp">Content Control List Item
Properties</link></paragraph>
-<paragraph role="paragraph" id="par_idN10559" xml-lang="en-US">Allows setting
properties on one list item of a drop-down content control which is under the
current cursor. When a list item is selected, the value of the content control
is updated based on that list item. In case display name is non-empty, that is
used. Otherwise the value is used.</paragraph>
-<paragraph role="heading" id="par_idN10550" xml-lang="en-US" level="2">Display
Name</paragraph>
-<paragraph role="paragraph" id="par_idN10560" xml-lang="en-US">A
human-friendly name, describing the list item.</paragraph>
-<paragraph role="heading" id="par_idN10551" xml-lang="en-US"
level="2">Value</paragraph>
-<paragraph role="paragraph" id="par_idN10561" xml-lang="en-US">A
machine-friendly name, describing the list item.</paragraph>
-</section>
-</body>
-</helpdocument>
diff --git a/source/text/swriter/guide/contentcontrols.xhp
b/source/text/swriter/guide/contentcontrols.xhp
new file mode 100644
index 0000000000..8576c9228e
--- /dev/null
+++ b/source/text/swriter/guide/contentcontrols.xhp
@@ -0,0 +1,181 @@
+<?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="usingcontentcontrols" indexer="include" status="PUBLISH">
+ <title id="tit" xml-lang="en-US">Using Content Controls in
%PRODUCTNAME Writer</title>
+ <filename>/text/swriter/guide/contentcontrols.xhp</filename>
+ </topic>
+</meta>
+<body>
+<section id="usingcontentcontrols">
+ <h1 id="hd_id21672742797240"><variable id="h1"><link
href="text/swriter/guide/contentcontrols.xhp">Using Content Controls in
%PRODUCTNAME Writer</link></variable></h1>
+</section>
+<embed
href="text/swriter/menu/contentcontrol_submenu.xhp#contentcontrol_submenu"/>
+<h2 id="hd_id621672745482542">Using Rich Text Content Control</h2>
+<list type="ordered">
+ <listitem>
+ <paragraph id="par_id651672747009666" role="listitem"><variable
id="firstinlist">Place the cursor at the insertion
location.</variable></paragraph>
+ </listitem>
+ <listitem>
+ <paragraph id="par_id891672747017835" localize="false"
role="listitem"><embedvar href="text/swriter/00/formmenu.xhp#rchtxt"
markup="ignore"/></paragraph>
+ </listitem>
+ <listitem>
+ <paragraph id="par_id551672747466268" localize="false"
role="listitem"><embedvar href="text/swriter/00/formmenu.xhp#prop"
markup="ignore"/></paragraph>
+ </listitem>
+ <listitem>
+ <paragraph id="par_id251672747811027" role="listitem"><variable
id="optionally">Optionally, select <emph>Content is placeholder text</emph>,
add a <emph>Title</emph> and a <emph>Tag</emph>.</variable></paragraph>
+ </listitem>
+ <listitem>
+ <paragraph id="par_id201672750353603" role="listitem"><variable
id="clickok">Click <emph>OK</emph> to close the <link
href="text/swriter/01/contentcontrol00.xhp"><emph>Content Control
Properties</emph></link> dialog.</variable></paragraph>
+ </listitem>
+ <listitem>
+ <paragraph id="par_id271672768162997" role="listitem">To insert rich
text, click in the control and type the text.</paragraph>
+ </listitem>
+</list>
+<h2 id="hd_id111672745487857">Using Plain Text Content Control</h2>
+<list type="ordered">
+ <listitem>
+ <paragraph id="par_id681672748280675" localize="false"
role="listitem"><embedvar
href="text/swriter/guide/contentcontrols.xhp#firstinlist"
markup="ignore"/></paragraph>
+ </listitem>
+ <listitem>
+ <paragraph id="par_id101672748747824" localize="false"
role="listitem"><embedvar href="text/swriter/00/formmenu.xhp#plntxt"
markup="ignore"/></paragraph>
+ </listitem>
+ <listitem>
+ <paragraph id="par_id901672748754729" localize="false"
role="listitem"><embedvar href="text/swriter/00/formmenu.xhp#prop"
markup="ignore"/></paragraph>
+ </listitem>
+ <listitem>
+ <paragraph id="par_id751672748761130" localize="false"
role="listitem"><embedvar
href="text/swriter/guide/contentcontrols.xhp#optionally"
markup="ignore"/></paragraph>
+ </listitem>
+ <listitem>
+ <paragraph id="par_id611672750428100" localize="false"
role="listitem"><embedvar href="text/swriter/guide/contentcontrols.xhp#clickok"
markup="ignore"/></paragraph>
+ </listitem>
+ <listitem>
+ <paragraph id="par_id541672768139134" role="listitem">To insert plain
text, click in the control and type the text.</paragraph>
+ </listitem>
+</list>
+<h2 id="hd_id911672745492634">Using Picture Content Control</h2>
+<list type="ordered">
+ <listitem>
+ <paragraph id="par_id191672749170542" localize="false"
role="listitem"><embedvar
href="text/swriter/guide/contentcontrols.xhp#firstinlist"
markup="ignore"/></paragraph>
+ </listitem>
+ <listitem>
+ <paragraph id="par_id311672749179486" localize="false"
role="listitem"><embedvar href="text/swriter/00/formmenu.xhp#pctr"
markup="ignore"/></paragraph>
+ </listitem>
+ <listitem>
+ <paragraph id="par_id581672749185614" role="listitem">Click on the
picture placeholder to open the <emph>Insert Image</emph> dialog, and select
the image file. The image is anchored <link
href="text/swriter/guide/anchor_object.xhp"><emph>as-character</emph></link> in
the document.</paragraph>
+ </listitem>
+</list>
+<h2 id="hd_id351672745497657">Using Check Box Content Control</h2>
+<list type="ordered">
+ <listitem>
+ <paragraph id="par_id301672750617648" localize="false"
role="listitem"><embedvar
href="text/swriter/guide/contentcontrols.xhp#firstinlist"
markup="ignore"/></paragraph>
+ </listitem>
+ <listitem>
+ <paragraph id="par_id151672750623262" localize="false"
role="listitem"><embedvar href="text/swriter/00/formmenu.xhp#chkbx"
markup="ignore"/></paragraph>
+ </listitem>
+ <listitem>
+ <paragraph id="par_id141672750629070" localize="false"
role="listitem"><embedvar
href="text/swriter/guide/contentcontrols.xhp#optionally"
markup="ignore"/></paragraph>
+ </listitem>
+ <listitem>
+ <paragraph id="par_id361672750636766" role="listitem">Choose the
checked and unchecked characters for the check box. Use the
<widget>Select</widget> button to open the <link
href="text/shared/01/04100000.xhp"><emph>Special Character</emph></link> dialog
and choose another character.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph id="par_id381672750644528" localize="false"
role="listitem"><embedvar href="text/swriter/guide/contentcontrols.xhp#clickok"
markup="ignore"/></paragraph>
+ </listitem>
+ <listitem>
+ <paragraph id="par_id721672767988766" role="listitem">Click on the
check box to check or uncheck it.</paragraph>
+ </listitem>
+</list>
+<h2 id="hd_id321672745501882">Using Drop-down List Content Control</h2>
+<list type="ordered">
+ <listitem>
+ <paragraph id="par_id551672751358357" localize="false"
role="listitem"><embedvar
href="text/swriter/guide/contentcontrols.xhp#firstinlist"
markup="ignore"/></paragraph>
+ </listitem>
+ <listitem>
+ <paragraph id="par_id421672751362922" localize="false"
role="listitem"><embedvar href="text/swriter/00/formmenu.xhp#drpdwn"
markup="ignore"/></paragraph>
+ </listitem>
+ <listitem>
+ <paragraph id="par_id551673447466268" localize="false"
role="listitem"><embedvar href="text/swriter/00/formmenu.xhp#prop"
markup="ignore"/></paragraph>
+ </listitem>
+ <listitem>
+ <paragraph id="par_id051672748761130" localize="false"
role="listitem"><embedvar
href="text/swriter/guide/contentcontrols.xhp#optionally"
markup="ignore"/></paragraph>
+ </listitem>
+ <listitem>
+ <paragraph id="par_id131672752219184" role="listitem">In the
<emph>List Items</emph> box:</paragraph>
+ </listitem>
+</list>
+ <list type="unordered">
+ <listitem>
+ <paragraph id="par_id361672751921825" role="listitem">Use the
<widget>Add</widget> button to add a new entry, entering the display name and
the value of the item in the <emph>Content Control List Item Property</emph>
dialog.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph id="par_id951672751926433" role="listitem">Use the
<widget>Modify</widget> button to change the name and value pair of the
selected entry.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph id="par_id741672751931470" role="listitem">Use the
<widget>Remove</widget> button to delete the selected entry of the
list.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph id="par_id41672751936178" role="listitem">Use the
<widget>Move Up</widget> and <widget>Move Down</widget> buttons to position the
selected entry in the list, respectively.</paragraph>
+ </listitem>
+ </list>
+<list type="ordered" startwith="6">
+ <listitem>
+ <paragraph id="par_id621672751395854" role="listitem"><embedvar
href="text/swriter/guide/contentcontrols.xhp#clickok"
markup="ignore"/></paragraph>
+ </listitem>
+ <listitem>
+ <paragraph id="par_id721672767925728" role="listitem">To insert a
content, click on the control to open the drop-down list, select one of the
items displayed.</paragraph>
+ </listitem>
+</list>
+<h2 id="hd_id61672745506193">Using Combo Box List Content Control</h2>
+<paragraph role="paragraph" id="par_id771672755699159">Different from the
<emph>Content Control Drop-down List</emph>, the <emph>Combo Box List</emph>
allows you to directly insert text in the box, or choose one of the items in
the list.</paragraph>
+<list type="ordered">
+ <listitem>
+ <paragraph id="par_id551901358357" localize="false"
role="listitem"><embedvar
href="text/swriter/guide/contentcontrols.xhp#firstinlist"
markup="ignore"/></paragraph>
+ </listitem>
+ <listitem>
+ <paragraph id="par_id4216727513322" localize="false"
role="listitem"><embedvar href="text/swriter/00/formmenu.xhp#cmbbx"
markup="ignore"/></paragraph>
+ </listitem>
+ <listitem>
+ <paragraph id="par_id556772747466268" localize="false"
role="listitem"><embedvar href="text/swriter/00/formmenu.xhp#prop"
markup="ignore"/></paragraph>
+ </listitem>
+ <listitem>
+ <paragraph id="par_id841672755499287" role="listitem">Follow
instructions for the <emph>Content Control Drop-down List</emph> to insert
display names and values to the list.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph id="par_id961672767890705" role="listitem">To insert a
content, click on the control to open a drop-down list, select one of the items
displayed or type your custom text.</paragraph>
+ </listitem>
+</list>
+<h2 id="hd_id221672745510196">Using Date Content Control</h2>
+<list type="ordered">
+ <listitem>
+ <paragraph id="par_id55766358357" localize="false"
role="listitem"><embedvar
href="text/swriter/guide/contentcontrols.xhp#firstinlist"
markup="ignore"/></paragraph>
+ </listitem>
+ <listitem>
+ <paragraph id="par_id42427513322" localize="false"
role="listitem"><embedvar href="text/swriter/00/formmenu.xhp#dt"
markup="ignore"/></paragraph>
+ </listitem>
+ <listitem>
+ <paragraph id="par_id5567709466268" localize="false"
role="listitem"><embedvar href="text/swriter/00/formmenu.xhp#prop"
markup="ignore"/></paragraph>
+ </listitem>
+ <listitem>
+ <paragraph id="par_id391672755927187" role="listitem">Choose one of
the date formats in the <emph>Date Format</emph> list.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph id="par_id41672755935739" localize="false"
role="listitem"><embedvar href="text/swriter/guide/contentcontrols.xhp#clickok"
markup="ignore"/></paragraph>
+ </listitem>
+ <listitem>
+ <paragraph id="par_id291672767767937" role="listitem">To insert a
date, click on the control to open a calendar object and choose the
date.</paragraph>
+ </listitem>
+</list>
+<section id="relatedtopics">
+ <paragraph role="paragraph" localize="false"
id="par_id461672768641518"><embedvar
href="text/swriter/menu/contentcontrol_submenu.xhp#h1"/></paragraph>
+</section>
+</body>
+</helpdocument>
diff --git a/source/text/swriter/main0120.xhp b/source/text/swriter/main0120.xhp
index 06f8c36c8c..cc2ae44ee2 100644
--- a/source/text/swriter/main0120.xhp
+++ b/source/text/swriter/main0120.xhp
@@ -60,6 +60,6 @@
<h2 id="hd_id811529763403256">Automatic Control Focus</h2>
<paragraph role="paragraph" id="par_id281529763411414"
xml-lang="en-US">Enable or disable Automatic Control Focus</paragraph>
</section>
-
+<embed
href="text/swriter/menu/contentcontrol_submenu.xhp#contentcontrol_submenu"/>
</body>
</helpdocument>
diff --git a/source/text/swriter/menu/contentcontrol_submenu.xhp
b/source/text/swriter/menu/contentcontrol_submenu.xhp
new file mode 100644
index 0000000000..1fc8252b72
--- /dev/null
+++ b/source/text/swriter/menu/contentcontrol_submenu.xhp
@@ -0,0 +1,59 @@
+<?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="contentcontrol_submenu" indexer="include" status="PUBLISH">
+ <title id="tit" xml-lang="en-US">Content Control Submenu</title>
+ <filename>/text/swriter/menu/contentcontrol_submenu.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <bookmark xml-lang="en-US" branch="index" id="bm_id901672741515183">
+<bookmark_value>content control</bookmark_value>
+<bookmark_value>checkbox;content control</bookmark_value>
+<bookmark_value>date;content control</bookmark_value>
+<bookmark_value>combo box;content control</bookmark_value>
+<bookmark_value>drop-down list;content control</bookmark_value>
+<bookmark_value>text;content control</bookmark_value>
+<bookmark_value>rich text;content control</bookmark_value>
+ </bookmark>
+ <section id="contentcontrol_submenu">
+ <h1 id="hd_id591672690941663"><variable id="h1"><link
href="text/swriter/menu/contentcontrol_submenu.xhp">Content
Controls</link></variable></h1>
+ <paragraph role="paragraph" id="par_idN10560" xml-lang="en-US">A
content control is a placeholder text in which the current content will be
replaced when clicking into the control. Content controls are individual
controls to add and customize for use in templates, forms, and documents.
Content controls can provide instructional text and set controls to disappear
when users type in their own text.</paragraph>
+ </section>
+ <paragraph role="paragraph" id="par_id771672704361268">Content controls
have many properties and are similar to the legacy controls but can be easier
to work with and format.</paragraph>
+ <bookmark xml-lang="en-US" branch="hid/.uno:InsertContentControl"
id="bm_id81672741876290" localize="false"/>
+ <h2 id="hd_id401672693292708">Rich Text</h2>
+ <paragraph role="paragraph" id="par_id71672703856991">Contains custom
formatted text or other items, such as tables, pictures, or other content
controls.</paragraph>
+ <bookmark xml-lang="en-US" branch="hid/.uno:InsertPlainTextContentControl"
id="bm_id991672741919139" localize="false"/>
+ <h2 id="hd_id71672693297394">Plain Text</h2>
+ <paragraph role="paragraph" id="par_id681672703870033">A plain text
content control is limited to plain text in a single or multiple paragraphs.
Unlike rich text, it cannot contain other items, such as tables, pictures, or
other content controls.</paragraph>
+ <bookmark xml-lang="en-US" branch="hid/.uno:InsertPictureContentControl"
id="bm_id881672741962636" localize="false"/>
+ <h2 id="hd_id571672693302104">Picture</h2>
+ <paragraph role="paragraph" id="par_id241672703879416">Contains a single
image anchored <link
href="text/swriter/guide/anchor_object.xhp"><emph>as-character</emph></link>.
Clicking on the content control opens the file open dialog to provide a
replacement for the picture placeholder.</paragraph>
+ <bookmark xml-lang="en-US" branch="hid/.uno:InsertCheckboxContentControl"
id="bm_id221672741995252" localize="false"/>
+ <h2 id="hd_id831672693306132">Check Box</h2>
+ <paragraph role="paragraph" id="par_id581672703896121">Contains a single
check box character to interact with. Clicking on the content control toggles
the checked state of the check box.</paragraph>
+ <bookmark xml-lang="en-US" branch="hid/.uno:InsertComboBoxContentControl"
id="bm_id691672741715045" localize="false"/>
+ <h2 id="hd_id711672693310034">Combo Box</h2>
+ <paragraph role="paragraph" id="par_id341672703909353">Contains a
drop-down selection of list entries that you can select and text box that you
can edit directly.</paragraph>
+ <bookmark xml-lang="en-US" branch="hid/.uno:InsertDropdownContentControl"
id="bm_id51672741814999" localize="false"/>
+ <h2 id="hd_id731672693314411">Drop-down List</h2>
+ <paragraph role="paragraph" id="par_id741672703915281">Contains a
drop-down button control with a list of display-text and value pairs. Unlike a
combo box, the drop-down list does not let users enter a custom
input.</paragraph>
+ <bookmark xml-lang="en-US" branch="hid/.uno:InsertDateContentControl"
id="bm_id921672742067053" localize="false"/>
+ <h2 id="hd_id191672693319354">Date</h2>
+ <paragraph role="paragraph" id="par_id841672703921231">Contains a calendar
control. Limits text to a single paragraph.</paragraph>
+ <embed href="text/swriter/01/contentcontrol00.xhp#contentcontrol"/>
+ <section id="relatedtopics">
+ <paragraph localize="false" role="paragraph"
id="par_id381672743276267"><embedvar
href="text/swriter/guide/contentcontrols.xhp#h1" markup="ignore"/></paragraph>
+ </section>
+</body>
+</helpdocument>
