summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--AllLangHelp_shared.mk2
-rw-r--r--AllLangHelp_simpress.mk1
-rw-r--r--AllLangHelp_swriter.mk2
-rw-r--r--help3xsl/default.css4
-rw-r--r--source/auxiliary/shared.tree4
-rw-r--r--source/auxiliary/swriter.tree4
-rw-r--r--source/text/sbasic/shared/exportasfixedformat.xhp2
-rw-r--r--source/text/scalc/01/04070400.xhp2
-rw-r--r--source/text/scalc/01/FormatSparklineMenu.xhp2
-rw-r--r--source/text/scalc/01/func_sortby.xhp150
-rw-r--r--source/text/scalc/01/sparklines.xhp2
-rw-r--r--source/text/scalc/guide/address_auto.xhp26
-rw-r--r--source/text/scalc/guide/value_with_name.xhp40
-rw-r--r--source/text/scalc/main0202.xhp4
-rw-r--r--source/text/schart/01/three_d_view.xhp4
-rw-r--r--source/text/sdraw/guide/graphic_insert.xhp7
-rw-r--r--source/text/sdraw/guide/main.xhp1
-rw-r--r--source/text/shared/00/00000010.xhp8
-rw-r--r--source/text/shared/00/00000401.xhp9
-rw-r--r--source/text/shared/00/00040502.xhp6
-rw-r--r--source/text/shared/01/01070000.xhp3
-rw-r--r--source/text/shared/01/05020000.xhp2
-rw-r--r--source/text/shared/01/05020200.xhp24
-rw-r--r--source/text/shared/01/05020400.xhp143
-rw-r--r--source/text/shared/01/05020500.xhp5
-rw-r--r--source/text/shared/01/05020700.xhp2
-rw-r--r--source/text/shared/01/06140402.xhp2
-rw-r--r--source/text/shared/01/06140500.xhp2
-rw-r--r--source/text/shared/01/DeleteColumns.xhp2
-rw-r--r--source/text/shared/01/DeleteRows.xhp2
-rw-r--r--source/text/shared/01/DeleteTable.xhp2
-rw-r--r--source/text/shared/01/SelectTable.xhp2
-rw-r--r--source/text/shared/01/SetOptimalRowHeight.xhp5
-rw-r--r--source/text/shared/01/certificatepath.xhp2
-rw-r--r--source/text/shared/01/gallery.xhp95
-rw-r--r--source/text/shared/01/notebook_bar.xhp15
-rw-r--r--source/text/shared/01/prop_font_embed.xhp44
-rw-r--r--source/text/shared/guide/digital_signatures.xhp71
-rw-r--r--source/text/shared/guide/dragdrop.xhp2
-rw-r--r--source/text/shared/guide/dragdrop_beamer.xhp2
-rw-r--r--source/text/shared/guide/dragdrop_fromgallery.xhp65
-rw-r--r--source/text/shared/guide/dragdrop_gallery.xhp6
-rw-r--r--source/text/shared/guide/dragdrop_graphic.xhp2
-rw-r--r--source/text/shared/guide/dragdrop_table.xhp2
-rw-r--r--source/text/shared/guide/gallery_insert.xhp127
-rw-r--r--source/text/shared/guide/insert_bitmap.xhp2
-rw-r--r--source/text/shared/guide/insert_graphic_drawit.xhp2
-rw-r--r--source/text/shared/guide/main.xhp1
-rw-r--r--source/text/shared/menu/style_menu.xhp31
-rw-r--r--source/text/shared/optionen/01060500.xhp8
-rw-r--r--source/text/shared/optionen/01060900.xhp74
-rw-r--r--source/text/shared/optionen/opencl.xhp22
-rw-r--r--source/text/simpress/format_submenu_lists.xhp31
-rw-r--r--source/text/simpress/main0203.xhp4
-rw-r--r--source/text/simpress/main_format.xhp27
-rw-r--r--source/text/swriter/00/00000405.xhp37
-rw-r--r--source/text/swriter/01/02110000.xhp10
-rw-r--r--source/text/swriter/01/02110100.xhp109
-rw-r--r--source/text/swriter/01/04090001.xhp20
-rw-r--r--source/text/swriter/01/04090003.xhp2
-rw-r--r--source/text/swriter/01/04090006.xhp2
-rw-r--r--source/text/swriter/01/04150000.xhp5
-rw-r--r--source/text/swriter/01/04180400.xhp2
-rw-r--r--source/text/swriter/01/05030200.xhp29
-rw-r--r--source/text/swriter/01/05120400.xhp7
-rw-r--r--source/text/swriter/01/mailmerge01.xhp2
-rw-r--r--source/text/swriter/01/paragraph_signature.xhp55
-rw-r--r--source/text/swriter/guide/dragdroptext.xhp2
-rw-r--r--source/text/swriter/guide/insert_graphic.xhp2
-rw-r--r--source/text/swriter/guide/insert_graphic_dialog.xhp2
-rw-r--r--source/text/swriter/guide/insert_graphic_fromchart.xhp25
-rw-r--r--source/text/swriter/guide/insert_graphic_fromdraw.xhp2
-rw-r--r--source/text/swriter/guide/insert_graphic_gallery.xhp53
-rw-r--r--source/text/swriter/guide/insert_graphic_scan.xhp2
-rw-r--r--source/text/swriter/guide/main.xhp2
-rw-r--r--source/text/swriter/main0110.xhp119
-rw-r--r--source/text/swriter/main0202.xhp48
77 files changed, 709 insertions, 939 deletions
diff --git a/AllLangHelp_shared.mk b/AllLangHelp_shared.mk
index 1ccd600c33..f8b46c1e10 100644
--- a/AllLangHelp_shared.mk
+++ b/AllLangHelp_shared.mk
@@ -165,7 +165,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
helpcontent2/source/text/shared/01/05020200 \
helpcontent2/source/text/shared/01/05020300 \
helpcontent2/source/text/shared/01/05020301 \
- helpcontent2/source/text/shared/01/05020400 \
helpcontent2/source/text/shared/01/05020500 \
helpcontent2/source/text/shared/01/05020600 \
helpcontent2/source/text/shared/01/05020700 \
@@ -739,7 +738,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
helpcontent2/source/text/shared/guide/doc_save \
helpcontent2/source/text/shared/guide/dragdrop \
helpcontent2/source/text/shared/guide/dragdrop_beamer \
- helpcontent2/source/text/shared/guide/dragdrop_fromgallery \
helpcontent2/source/text/shared/guide/dragdrop_gallery \
helpcontent2/source/text/shared/guide/dragdrop_graphic \
helpcontent2/source/text/shared/guide/dragdrop_table \
diff --git a/AllLangHelp_simpress.mk b/AllLangHelp_simpress.mk
index 2d0ac32af0..e79a530b61 100644
--- a/AllLangHelp_simpress.mk
+++ b/AllLangHelp_simpress.mk
@@ -194,7 +194,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,simpress,\
helpcontent2/source/text/simpress/main0103 \
helpcontent2/source/text/simpress/main0104 \
helpcontent2/source/text/simpress/main_format \
- helpcontent2/source/text/simpress/format_submenu_lists \
helpcontent2/source/text/simpress/main0107 \
helpcontent2/source/text/simpress/main0113 \
helpcontent2/source/text/simpress/main0114 \
diff --git a/AllLangHelp_swriter.mk b/AllLangHelp_swriter.mk
index cbd647014e..838b8a291a 100644
--- a/AllLangHelp_swriter.mk
+++ b/AllLangHelp_swriter.mk
@@ -200,6 +200,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,swriter,\
helpcontent2/source/text/swriter/01/mm_seltab \
helpcontent2/source/text/swriter/01/outlinecontent_visibility \
helpcontent2/source/text/swriter/01/pagenumbering \
+ helpcontent2/source/text/swriter/01/paragraph_signature \
helpcontent2/source/text/swriter/01/protectdocument \
helpcontent2/source/text/swriter/01/RowSplit \
helpcontent2/source/text/swriter/01/selection_mode \
@@ -338,7 +339,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,swriter,\
helpcontent2/source/text/swriter/guide/insert_graphic_dialog \
helpcontent2/source/text/swriter/guide/insert_graphic_fromchart \
helpcontent2/source/text/swriter/guide/insert_graphic_fromdraw \
- helpcontent2/source/text/swriter/guide/insert_graphic_gallery \
helpcontent2/source/text/swriter/guide/insert_graphic_scan \
helpcontent2/source/text/swriter/guide/insert_tab_innumbering \
helpcontent2/source/text/swriter/guide/join_numbered_lists \
diff --git a/help3xsl/default.css b/help3xsl/default.css
index 5bcd2c28f1..2a1fb17cb8 100644
--- a/help3xsl/default.css
+++ b/help3xsl/default.css
@@ -190,6 +190,10 @@ code[class*="language-"], pre[class*="language-"] {
white-space: pre-wrap;
}
+pre[class*="language-"] > code {
+ z-index: 0;
+}
+
/* Table related classes */
/* Special case of table with one cell*/
diff --git a/source/auxiliary/shared.tree b/source/auxiliary/shared.tree
index 3d33ff922d..d96471f4f0 100644
--- a/source/auxiliary/shared.tree
+++ b/source/auxiliary/shared.tree
@@ -123,13 +123,13 @@
<topic id="swriter/text/swriter/guide/dragdroptext.xhp">Moving and Copying Text in Documents</topic>
<topic id="shared/text/shared/guide/dragdrop_table.xhp">Copying Spreadsheet Areas to Text Documents</topic>
<topic id="shared/text/shared/guide/dragdrop_graphic.xhp">Copying Graphics Between Documents</topic>
- <topic id="shared/text/shared/guide/dragdrop_fromgallery.xhp">Copying Graphics From the Gallery</topic>
+ <topic id="shared/text/shared/guide/gallery_insert.xhp">Copying Graphics From the Gallery</topic>
<topic id="shared/text/shared/guide/dragdrop_beamer.xhp">Drag-and-Drop With the Data Source View</topic>
</node>
<node id="1010" title="Copy and Paste">
<topic id="shared/text/shared/guide/copy_drawfunctions.xhp">Copying Drawing Objects Into Other Documents</topic>
<topic id="shared/text/shared/guide/dragdrop_graphic.xhp">Copying Graphics Between Documents</topic>
- <topic id="shared/text/shared/guide/dragdrop_fromgallery.xhp">Copying Graphics From the Gallery</topic>
+ <topic id="text/shared/guide/gallery_insert.xhp">Copying Graphics From the Gallery</topic>
<topic id="shared/text/shared/guide/dragdrop_table.xhp">Copying Spreadsheet Areas to Text Documents</topic>
</node>
<node id="1012" title="Charts and Diagrams">
diff --git a/source/auxiliary/swriter.tree b/source/auxiliary/swriter.tree
index bbe836d865..a614a763f1 100644
--- a/source/auxiliary/swriter.tree
+++ b/source/auxiliary/swriter.tree
@@ -35,7 +35,7 @@
<topic id="swriter/text/swriter/main0103.xhp">View</topic>
<topic id="swriter/text/swriter/main0104.xhp">Insert</topic>
<topic id="swriter/text/swriter/main0105.xhp">Format</topic>
- <topic id="shared/text/shared/menu/style_menu.xhp">Styles</topic>
+ <topic id="swriter/text/swriter/main0115.xhp">Styles</topic>
<topic id="swriter/text/swriter/main0110.xhp">Table</topic>
<topic id="swriter/text/swriter/main0120.xhp">Form</topic>
<topic id="swriter/text/shared/main_tools.xhp">Tools</topic>
@@ -111,7 +111,7 @@
<node id="0204" title="Graphics in Text Documents">
<topic id="swriter/text/swriter/guide/insert_graphic.xhp">Inserting Graphics</topic>
<topic id="swriter/text/swriter/guide/insert_graphic_dialog.xhp">Inserting a Graphic From a File</topic>
- <topic id="swriter/text/swriter/guide/insert_graphic_gallery.xhp">Inserting Graphics From the Gallery With Drag-and-Drop</topic>
+ <topic id="swriter/text/shared/guide/gallery_insert.xhp">Inserting Graphics From the Gallery</topic>
<topic id="swriter/text/swriter/guide/insert_graphic_scan.xhp">Inserting a Scanned Image</topic>
<topic id="swriter/text/swriter/guide/insert_graphic_fromchart.xhp">Inserting a Calc Chart into a Text Document</topic>
<topic id="swriter/text/swriter/guide/insert_graphic_fromdraw.xhp">Inserting Graphics From %PRODUCTNAME Draw or Impress</topic>
diff --git a/source/text/sbasic/shared/exportasfixedformat.xhp b/source/text/sbasic/shared/exportasfixedformat.xhp
index 2705c8c865..0259209369 100644
--- a/source/text/sbasic/shared/exportasfixedformat.xhp
+++ b/source/text/sbasic/shared/exportasfixedformat.xhp
@@ -11,7 +11,7 @@
<meta>
<topic id="text/sbasic/shared/exportasfixedformat.xhp" indexer="include" status="PUBLISH">
- <title id="tit">ExportAsFixedFormat</title>
+ <title id="tit" localize="false">ExportAsFixedFormat</title>
<filename>/text/sbasic/shared/exportasfixedformat.xhp</filename>
</topic>
</meta>
diff --git a/source/text/scalc/01/04070400.xhp b/source/text/scalc/01/04070400.xhp
index 60fef5b4a8..781a3f465d 100644
--- a/source/text/scalc/01/04070400.xhp
+++ b/source/text/scalc/01/04070400.xhp
@@ -35,7 +35,7 @@
<bookmark branch="hid/modules/scalc/ui/namerangesdialog/@@nowidget@@" id="bm_id3150447" localize="false"/>
<section id="define_label_range">
- <h1 id="hd_id3150791"><link href="text/scalc/01/04070400.xhp">Define Label Range</link></h1>
+ <h1 id="hd_id3150791"><variable id="h1"><link href="text/scalc/01/04070400.xhp">Define Label Range</link></variable></h1>
<paragraph role="paragraph" id="par_id3150868"><variable id="beschtext"><ahelp hid=".uno:DefineLabelRange">Opens a dialog in which you can define a label range.</ahelp></variable></paragraph>
</section>
diff --git a/source/text/scalc/01/FormatSparklineMenu.xhp b/source/text/scalc/01/FormatSparklineMenu.xhp
index bb77bab5cc..a98712e320 100644
--- a/source/text/scalc/01/FormatSparklineMenu.xhp
+++ b/source/text/scalc/01/FormatSparklineMenu.xhp
@@ -33,7 +33,7 @@
<paragraph role="paragraph" id="par_id381701562072857">Deletes all sparklines of the group at the current cell or selection.</paragraph>
<bookmark branch="hid/.uno:EditSparklineGroup" id="bm_id821701553450018" localize="false"/>
<h2 id="hd_id521701553498239">Edit Sparkline Group</h2>
- <paragraph role="paragraph" id="par_id801701562077297">Edits the properties of the sparkline group. The properties applies to all sparklines in the group.</paragraph>
+ <paragraph role="paragraph" id="par_id801701562077297">Edits the properties of the sparkline group. The properties apply to all sparklines in the group.</paragraph>
<bookmark branch="hid/.uno:EditSparkline" id="bm_id151701553460496" localize="false"/>
<h2 id="hd_id311701553503214">Edit Sparkline</h2>
<paragraph role="paragraph" id="par_id241701562081481">Edits the properties of the sparkline at the current cell, if any.</paragraph>
diff --git a/source/text/scalc/01/func_sortby.xhp b/source/text/scalc/01/func_sortby.xhp
index d22710928e..332005731a 100644
--- a/source/text/scalc/01/func_sortby.xhp
+++ b/source/text/scalc/01/func_sortby.xhp
@@ -30,158 +30,8 @@
<paragraph role="paragraph" id="par_id291711544460323"><emph>SortByRange1, SortByRange2,... </emph>: Range 1, range 2,... are the arrays or ranges to sort on.</paragraph>
<paragraph role="paragraph" id="par_id501711544465886"><emph>SortOrder1, SortOrder2,...</emph> : Order 1, order 2,... are the orders to use for sorting. 1 for ascending, -1 for descending. Default is ascending.</paragraph>
<embed href="text/scalc/01/ful_func.xhp#func_head_example"/>
-<section id="ex_func_average_table">
- <paragraph role="paragraph" id="hd_id2609201512474295">Consider the following table</paragraph>
- <table id="table_averageif_example">
- <tablerow>
- <tablecell>
- </tablecell>
- <tablecell>
- <paragraph id="par_id2509201517430799" role="tablehead" localize="false">A</paragraph>
- </tablecell>
- <tablecell>
- <paragraph id="par_id250920151743116" role="tablehead" localize="false">B</paragraph>
- </tablecell>
- <tablecell>
- <paragraph id="par_id2509201517431582" role="tablehead" localize="false">C</paragraph>
- </tablecell>
- </tablerow>
- <tablerow>
- <tablecell>
- <paragraph id="par_id2509201517431967" role="tablehead" localize="false">1</paragraph>
- </tablecell>
- <tablecell>
- <paragraph id="par_id18260631312423" role="tablecontent" localize="false">Product Name</paragraph>
- </tablecell>
- <tablecell>
- <paragraph id="par_id2509201517433075" role="tablecontent" localize="false">Sales</paragraph>
- </tablecell>
- <tablecell>
- <paragraph id="par_id2509201519383294" role="tablecontent" localize="false">Revenue</paragraph>
- </tablecell>
- </tablerow>
- <tablerow>
- <tablecell>
- <paragraph id="par_id959660094035" role="tablehead" localize="false">2</paragraph>
- </tablecell>
- <tablecell>
- <paragraph id="par_id2855779586764" role="tablecontent" localize="false">pencil</paragraph>
- </tablecell>
- <tablecell>
- <paragraph id="par_id110202156219769" role="tablecontent" localize="false">20</paragraph>
- </tablecell>
- <tablecell>
- <paragraph id="par_id23281929326512" role="tablecontent" localize="false">65</paragraph>
- </tablecell>
- </tablerow>
- <tablerow>
- <tablecell>
- <paragraph id="par_id2509201517432278" role="tablehead" localize="false">3</paragraph>
- </tablecell>
- <tablecell>
- <paragraph id="par_id24967262611733" role="tablecontent" localize="false">pen</paragraph>
- </tablecell>
- <tablecell>
- <paragraph id="par_id2509201517433391" role="tablecontent" localize="false">35</paragraph>
- </tablecell>
- <tablecell>
- <paragraph id="par_id250920151938352" role="tablecontent" localize="false">85</paragraph>
- </tablecell>
- </tablerow>
- <tablerow>
- <tablecell>
- <paragraph id="par_id250920151743267" role="tablehead" localize="false">4</paragraph>
- </tablecell>
- <tablecell>
- <paragraph id="par_id252542413030532" role="tablecontent" localize="false">notebook</paragraph>
- </tablecell>
- <tablecell>
- <paragraph id="par_id2509201517433781" role="tablecontent" localize="false">20</paragraph>
- </tablecell>
- <tablecell>
- <paragraph id="par_id2509201519383822" role="tablecontent" localize="false">190</paragraph>
- </tablecell>
- </tablerow>
- <tablerow>
- <tablecell>
- <paragraph id="par_id2509201519371339" role="tablehead">5</paragraph>
- </tablecell>
- <tablecell>
- <paragraph id="par_id2509201519374677" role="tablecontent" localize="false">book</paragraph>
- </tablecell>
- <tablecell>
- <paragraph id="par_id2509201519373350" role="tablecontent" localize="false">17</paragraph>
- </tablecell>
- <tablecell>
- <paragraph id="par_id2509201519384171" role="tablecontent" localize="false">180</paragraph>
- </tablecell>
- </tablerow>
- <tablerow>
- <tablecell>
- <paragraph id="par_id591711556978009" role="tablehead" localize="false">6</paragraph>
- </tablecell>
- <tablecell>
- <paragraph id="par_id491711556981497" role="tablecontent" localize="false">pencil-case</paragraph>
- </tablecell>
- <tablecell>
- <paragraph id="par_id981711556984697" role="tablecontent">not</paragraph>
- </tablecell>
- <tablecell>
- <paragraph id="par_id581711556987385" role="tablecontent">not</paragraph>
- </tablecell>
- </tablerow>
- <tablerow>
- <tablecell>
- <paragraph id="par_id21711558790356" role="tablehead" localize="false">7</paragraph>
- </tablecell>
- <tablecell>
- <paragraph id="par_id611711558792980" role="tablecontent" localize="false">pen</paragraph>
- </tablecell>
- <tablecell>
- <paragraph id="par_id531711558796019" role="tablecontent" localize="false">10</paragraph>
- </tablecell>
- <tablecell>
- <paragraph id="par_id1001711558799131" role="tablecontent" localize="false">45</paragraph>
- </tablecell>
- </tablerow>
- </table>
-</section>
-<h4 id="hd_id751711480783220">Example with ascending order and descending order (for English locale)</h4>
<paragraph role="paragraph" id="par_id131711466000482"><input>{=SORTBY(A2:C7,A2:A7,1,C2:C7,-1)}</input></paragraph>
<paragraph role="paragraph" id="par_id471711472262161">Sort the range A2:C7 based on the first column in ascending order and third column in descending order.</paragraph>
-<table id="result">
- <tablerow>
- <tablecell><paragraph id="par_id131711562867138" role="paragraph" localize="false">book</paragraph></tablecell>
- <tablecell><paragraph id="par_id191711562870330" role="paragraph" localize="false">17</paragraph></tablecell>
- <tablecell><paragraph id="par_id541711562873250" role="paragraph" localize="false">180</paragraph></tablecell>
- </tablerow>
- <tablerow>
- <tablecell><paragraph id="par_id711711562876682" role="paragraph" localize="false">notebook</paragraph></tablecell>
- <tablecell><paragraph id="par_id751711562882018" role="paragraph" localize="false">20</paragraph></tablecell>
- <tablecell><paragraph id="par_id731711562884834" role="paragraph" localize="false">190</paragraph></tablecell>
- </tablerow>
- <tablerow>
- <tablecell><paragraph id="par_id411711562887786" role="paragraph" localize="false">pen</paragraph></tablecell>
- <tablecell><paragraph id="par_id71711562890593" role="paragraph" localize="false">35</paragraph></tablecell>
- <tablecell><paragraph id="par_id771711562894241" role="paragraph" localize="false">85</paragraph></tablecell>
- </tablerow>
- <tablerow>
- <tablecell><paragraph id="par_id441711562897126" role="paragraph" localize="false">pen</paragraph></tablecell>
- <tablecell><paragraph id="par_id481711562903505" role="paragraph" localize="false">10</paragraph></tablecell>
- <tablecell><paragraph id="par_id761711562907000" role="paragraph" localize="false">45</paragraph></tablecell>
- </tablerow>
- <tablerow>
- <tablecell><paragraph id="par_id271711562909933" role="paragraph" localize="false">pencil</paragraph></tablecell>
- <tablecell><paragraph id="par_id591711562914472" role="paragraph" localize="false">20</paragraph></tablecell>
- <tablecell><paragraph id="par_id781711562918184" role="paragraph" localize="false">65</paragraph></tablecell>
- </tablerow>
- <tablerow>
- <tablecell><paragraph id="par_id441711562922161" role="paragraph" localize="false">pencil-case</paragraph></tablecell>
- <tablecell><paragraph id="par_id981711562925887" role="paragraph" localize="false">not</paragraph></tablecell>
- <tablecell><paragraph id="par_id361711562929239" role="paragraph" localize="false">not</paragraph></tablecell>
- </tablerow>
-</table>
-
<embed href="text/scalc/01/common_func.xhp#sectiontechinfo"/>
<embed href="text/scalc/00/avail_release.xhp#24.8"/>
<embed href="text/scalc/01/common_func.xhp#notODFF"/>
diff --git a/source/text/scalc/01/sparklines.xhp b/source/text/scalc/01/sparklines.xhp
index a9126832fe..039f813f2c 100644
--- a/source/text/scalc/01/sparklines.xhp
+++ b/source/text/scalc/01/sparklines.xhp
@@ -24,7 +24,7 @@
</bookmark>
<section id="sparklinesh1">
<h1 id="hd_id721654173263812"><variable id="sparklines"><link href="text/scalc/01/sparklines.xhp">Sparklines</link></variable></h1>
- <paragraph role="paragraph" id="par_id401698839153661">Opens the <emph>Sparklines Properties</emph> dialog to define sparklines properties.</paragraph>
+ <paragraph role="paragraph" id="par_id401698839153661">Opens the <emph>Sparklines Properties</emph> dialog to define sparkline settings.</paragraph>
</section>
<section id="howtoget">
<embed href="text/scalc/00/00000404.xhp#sparklines"/>
diff --git a/source/text/scalc/guide/address_auto.xhp b/source/text/scalc/guide/address_auto.xhp
index dfccbc2aee..f14b44d2f8 100644
--- a/source/text/scalc/guide/address_auto.xhp
+++ b/source/text/scalc/guide/address_auto.xhp
@@ -20,14 +20,13 @@
<meta>
<topic id="textscalcguideaddress_autoxml" indexer="include" status="PUBLISH">
- <title id="tit" xml-lang="en-US">Recognizing Names as Addressing</title>
+ <title id="tit">Recognizing Names as Addressing</title>
<filename>/text/scalc/guide/address_auto.xhp</filename>
</topic>
</meta>
<body>
-
-<bookmark xml-lang="en-US" branch="index" id="bm_id3148797">
+<bookmark branch="index" id="bm_id3148797">
<bookmark_value>automatic addressing in tables</bookmark_value>
<bookmark_value>natural language addressing</bookmark_value>
<bookmark_value>formulas; using row/column labels</bookmark_value>
@@ -43,18 +42,19 @@
<comment>mw changes "names;..." entry to "text in cells;..."</comment><comment>mw inserted three index entries from text/shared/optionen/01060500.xhp. Changed "finding;..." entry to "recognizing;..." entry. Adding (Calc) is no longer necessary in this file.</comment>
<h1 id="hd_id3148797"><variable id="address_auto"><link href="text/scalc/guide/address_auto.xhp">Recognizing Names as Addressing</link></variable></h1>
-<paragraph id="par_id3152597" role="paragraph" xml-lang="en-US">You can use cells with text to refer to the rows or to the columns that contain the cells.</paragraph><comment>removed table as a workaround for issue 108715</comment>
-<paragraph id="par_id3156283" role="paragraph" xml-lang="en-US"><image id="img_id3154942" src="media/helpimg/names_as_addressing.png" width="5.408cm" height="2.212cm" localize="true"><alt xml-lang="en-US" id="alt_id3154942">Example spreadsheet</alt></image></paragraph>
-<paragraph id="par_id3154512" role="paragraph" xml-lang="en-US">In the example spreadsheet, you can use the string <item type="literal">'Column One'</item> in a formula to refer to the cell range <item type="literal">B3</item> to <item type="literal">B5</item>, or <item type="literal">'Column Two'</item> for the cell range <item type="literal">C2</item> to <item type="literal">C5</item>. You can also use <item type="literal">'Row One'</item> for the cell range <item type="literal">B3</item> to <item type="literal">D3</item>, or <item type="literal">'Row Two'</item> for the cell range <item type="literal">B4</item> to <item type="literal">D4</item>. The result of a formula that uses a cell name, for example, <item type="literal">SUM('Column One')</item>, is 600.</paragraph>
-<paragraph id="par_id3155443" role="paragraph" xml-lang="en-US">Automatically finding labels is a legacy feature and deactivated by default as it can produce nondeterministic behavior depending on actual document content. To turn this function on, choose <switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph></caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - %PRODUCTNAME Calc - Calculate</emph> and mark the <emph>Automatically find column and row labels</emph> check box.</paragraph>
-<paragraph id="par_id3155444" role="paragraph" xml-lang="en-US">Using defined labels instead is always possible and behaves similar but in a defined way.</paragraph>
-<paragraph id="par_id3149210" role="tip" xml-lang="en-US">If you enter a label name in the formula yourself, enclose the name in single quotation marks ('). If a single quotation mark appears in a name, you must double it, for example, <item type="literal">'Harry''s Bar'</item>.</paragraph>
+<paragraph id="par_id3152597" role="paragraph">You can use cells with text to refer to the rows or to the columns that contain the cells.</paragraph><comment>removed table as a workaround for issue 108715</comment>
+<paragraph role="paragraph" id="par_id81713445694889">If the resulting cell is below or above another cell containing text, %PRODUCTNAME Calc assumes the text as a row label, else %PRODUCTNAME Calc assumes the text as a column label.</paragraph>
+<paragraph id="par_id3156283" role="paragraph"><image id="img_id3154942" src="media/helpimg/names_as_addressing.png" width="380px" height="150px" localize="true"><alt id="alt_id3154942">Example spreadsheet</alt></image></paragraph>
+<paragraph id="par_id3154512" role="paragraph">In the example spreadsheet, you can use the string <item type="literal">'Column One'</item> in a formula to refer to the cell range <item type="literal">B3</item> to <item type="literal">B5</item>, or <item type="literal">'Column Two'</item> for the cell range <item type="literal">C2</item> to <item type="literal">C5</item>. You can also use <item type="literal">'Row One'</item> for the cell range <item type="literal">B3</item> to <item type="literal">D3</item>, or <item type="literal">'Row Two'</item> for the cell range <item type="literal">B4</item> to <item type="literal">D4</item>. The result of a formula that uses a cell name, for example, <item type="literal">SUM('Column One')</item>, is 600.</paragraph>
+<warning id="par_id3155443">Automatically finding labels is a legacy feature and deactivated by default as it can produce nondeterministic behavior depending on actual document content. To turn this function on, choose <switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph></caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - %PRODUCTNAME Calc - Calculate</emph> and mark the <emph>Automatically find column and row labels</emph> check box.</warning>
+<paragraph id="par_id3155444" role="paragraph">Using defined labels instead is always possible and behaves similar but in a defined way.</paragraph>
+<tip id="par_id3149210">If you enter a label name in the formula yourself, enclose the name in single quotation marks ('). If a single quotation mark appears in a name, you must double it, for example, <item type="literal">'Harry''s Bar'</item>.</tip>
<section id="relatedtopics"><comment>mw changed reference to deleted Calc guide address_byname.xhp to refer to Calc guide value_with_name.xhp</comment><comment>UFI: changed embedvar links to embed links</comment>
-<embed href="text/scalc/guide/value_with_name.xhp#value_with_name"/>
-<embed href="text/scalc/01/04070400.xhp#define_label_range"/>
-<embed href="text/scalc/guide/relativ_absolut_ref.xhp#relativ_absolut_ref"/>
+ <paragraph role="paragraph" id="par_id671713443783478" localize="false"><embedvar href="text/scalc/guide/value_with_name.xhp#value_with_name" markup="ignore"/></paragraph>
+ <paragraph role="paragraph" id="par_id21713443788358" localize="false"><embedvar href="text/scalc/01/04070400.xhp#h1" markup="ignore"/></paragraph>
+ <paragraph role="paragraph" id="par_id61713443792677" localize="false"><embedvar href="text/scalc/guide/relativ_absolut_ref.xhp#relativ_absolut_ref" markup="ignore"/></paragraph>
</section>
</body>
-</helpdocument> \ No newline at end of file
+</helpdocument>
diff --git a/source/text/scalc/guide/value_with_name.xhp b/source/text/scalc/guide/value_with_name.xhp
index 2b706ad593..e7d5017021 100644
--- a/source/text/scalc/guide/value_with_name.xhp
+++ b/source/text/scalc/guide/value_with_name.xhp
@@ -22,12 +22,12 @@
<meta>
<topic id="textscalcguidevalue_with_namexml" indexer="include" status="PUBLISH">
- <title xml-lang="en-US" id="tit">Naming Cells</title>
+ <title id="tit">Naming Cells</title>
<filename>/text/scalc/guide/value_with_name.xhp</filename>
</topic>
</meta>
<body>
-<bookmark xml-lang="en-US" branch="index" id="bm_id3147434"><bookmark_value>cells; defining names</bookmark_value>
+<bookmark branch="index" id="bm_id3147434"><bookmark_value>cells; defining names</bookmark_value>
<bookmark_value>names; defining for cells</bookmark_value>
<bookmark_value>values; defining names</bookmark_value>
<bookmark_value>constants definition</bookmark_value>
@@ -41,43 +41,43 @@
<bookmark_value>allowed cell names</bookmark_value>
<bookmark_value>renaming;cells</bookmark_value>
</bookmark><comment>mw changed "names;...", "addressing;..." and "references,..." entries.</comment><comment>mw added "renaming;"</comment>
-<paragraph xml-lang="en-US" id="hd_id3147434" role="heading" level="1"><variable id="value_with_name"><link href="text/scalc/guide/value_with_name.xhp">Naming Cells</link>
-</variable></paragraph>
+<h1 id="hd_id3147434"><variable id="value_with_name"><link href="text/scalc/guide/value_with_name.xhp">Naming Cells</link>
+</variable></h1>
<h2 id="hd_id4391918">Allowed names</h2>
- <paragraph xml-lang="en-US" id="par_id2129581" role="paragraph">Names in Calc can contain letters, numeric characters, and the underline character. Names must start with a letter or an underline character.</paragraph>
- <paragraph xml-lang="en-US" id="par_id1120029" role="paragraph">Allowed special characters:</paragraph>
+ <paragraph id="par_id2129581" role="paragraph">Names in Calc can contain letters, numeric characters, and the underline character. Names must start with a letter or an underline character.</paragraph>
+ <paragraph id="par_id1120029" role="paragraph">Allowed special characters:</paragraph>
<list type="unordered">
<listitem>
- <paragraph xml-lang="en-US" id="par_id3362224" role="paragraph">underline (_) </paragraph>
+ <paragraph id="par_id3362224" role="paragraph">underline (_) </paragraph>
</listitem>
</list>
- <paragraph xml-lang="en-US" id="par_id328989" role="paragraph">Names must not be the same as cell references. For example, the name A1 is invalid because A1 is a cell reference to the top left cell.</paragraph>
- <paragraph xml-lang="en-US" id="par_id32898987" role="paragraph">Names must not start with the letters C or R followed by a number; also single characters C and R are not allowed as names. See the ADDRESS function for more information.</paragraph>
- <paragraph xml-lang="en-US" id="par_id4769737" role="paragraph">Names for cell ranges must not include blanks. Blanks are allowed within names for sheets and documents.</paragraph>
+ <paragraph id="par_id328989" role="paragraph">Names must not be the same as cell references. For example, the name A1 is invalid because A1 is a cell reference to the top left cell.</paragraph>
+ <paragraph id="par_id32898987" role="paragraph">Names must not start with the letters C or R followed by a number; also single characters C and R are not allowed as names. See the ADDRESS function for more information.</paragraph>
+ <paragraph id="par_id4769737" role="paragraph">Names for cell ranges must not include blanks. Blanks are allowed within names for sheets and documents.</paragraph>
<h2 id="hd_id1226233">Naming cells and formulas</h2>
- <paragraph xml-lang="en-US" id="par_id5489364" role="paragraph">A good way of making the references to cells and cell ranges in formulas legible is to give the ranges names. For example, you can name the range A1:B2 <emph>Start</emph>. You can then write a formula such as "=SUM(Start)". Even after you insert or delete rows or columns, $[officename] still correctly assigns the ranges identified by name. Range names must not contain any spaces.</paragraph>
- <paragraph xml-lang="en-US" id="par_id953398" role="paragraph">For example, it is much easier to read a formula for sales tax if you can write "= Amount * Tax_rate" instead of "= A5 * B12". In this case, you would name cell A5 "Amount" and cell B12 "Tax_rate."</paragraph>
- <paragraph xml-lang="en-US" id="par_id4889675" role="paragraph">Use the <emph>Define Names</emph> dialog to define names for formulas or parts of formulas you need more often. In order to specify range names,</paragraph>
+ <paragraph id="par_id5489364" role="paragraph">A good way of making the references to cells and cell ranges in formulas legible is to give the ranges names. For example, you can name the range A1:B2 <emph>Start</emph>. You can then write a formula such as "=SUM(Start)". Even after you insert or delete rows or columns, $[officename] still correctly assigns the ranges identified by name. Range names must not contain any spaces.</paragraph>
+ <paragraph id="par_id953398" role="paragraph">For example, it is much easier to read a formula for sales tax if you can write "= Amount * Tax_rate" instead of "= A5 * B12". In this case, you would name cell A5 "Amount" and cell B12 "Tax_rate."</paragraph>
+ <paragraph id="par_id4889675" role="paragraph">Use the <emph>Define Names</emph> dialog to define names for formulas or parts of formulas you need more often. In order to specify range names,</paragraph>
<list type="ordered">
<listitem>
- <paragraph xml-lang="en-US" id="par_id3153954" role="listitem">Select a cell or range of cells, then choose <emph>Sheet - Named Ranges and Expressions - Define</emph>. The <emph>Define Names</emph> dialog appears.</paragraph>
+ <paragraph id="par_id3153954" role="listitem">Select a cell or range of cells, then choose <emph>Sheet - Named Ranges and Expressions - Define</emph>. The <emph>Define Names</emph> dialog appears.</paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_id3156283" role="listitem">Type the name of the selected area in the <emph>Name</emph> field. Click <emph>Add</emph>. The newly defined name appears in the list below. Click OK to close the dialog.</paragraph>
+ <paragraph id="par_id3156283" role="listitem">Type the name of the selected area in the <emph>Name</emph> field. Click <emph>Add</emph>. The newly defined name appears in the list below. Click OK to close the dialog.</paragraph>
</listitem>
</list>
- <paragraph xml-lang="en-US" id="par_id5774101" role="paragraph">You can also name other cell ranges in this dialog by entering the name in the field and then selecting the respective cells.</paragraph>
- <paragraph xml-lang="en-US" id="par_id3154942" role="paragraph">If you type the name in a formula, after the first few characters entered you will see the entire name as a tip.</paragraph>
+ <paragraph id="par_id5774101" role="paragraph">You can also name other cell ranges in this dialog by entering the name in the field and then selecting the respective cells.</paragraph>
+ <paragraph id="par_id3154942" role="paragraph">If you type the name in a formula, after the first few characters entered you will see the entire name as a tip.</paragraph>
<list type="unordered">
<listitem>
- <paragraph xml-lang="en-US" id="par_id3154510" role="listitem">Press the Enter key in order to accept the name from the tip.</paragraph>
+ <paragraph id="par_id3154510" role="listitem">Press the Enter key in order to accept the name from the tip.</paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_id3150749" role="listitem">If more than one name starts with the same characters, you can scroll forward through all the names using the <switchinline select="sys"><caseinline select="MAC"><keycode>Command</keycode></caseinline><defaultinline><keycode>Ctrl</keycode></defaultinline></switchinline> <keycode>+ Tab keys</keycode> and backward using the <keycode>Shift +</keycode> <switchinline select="sys"><caseinline select="MAC"><keycode>Command</keycode></caseinline><defaultinline><keycode>Ctrl</keycode></defaultinline></switchinline> <keycode>+ Tab</keycode> keys.<comment>mw copied contents from Calc guide address_byname.xhp</comment></paragraph>
+ <paragraph id="par_id3150749" role="listitem">If more than one name starts with the same characters, you can scroll forward through all the names using the <switchinline select="sys"><caseinline select="MAC"><keycode>Command</keycode></caseinline><defaultinline><keycode>Ctrl</keycode></defaultinline></switchinline> <keycode>+ Tab keys</keycode> and backward using the <keycode>Shift +</keycode> <switchinline select="sys"><caseinline select="MAC"><keycode>Command</keycode></caseinline><defaultinline><keycode>Ctrl</keycode></defaultinline></switchinline> <keycode>+ Tab</keycode> keys.<comment>mw copied contents from Calc guide address_byname.xhp</comment></paragraph>
</listitem>
</list>
<section id="relatedtopics">
- <paragraph xml-lang="en-US" id="par_id3153711" role="paragraph"><link href="text/scalc/01/04070100.xhp">Sheet - Named Ranges and Expressions - Define</link></paragraph>
+ <paragraph id="par_id3153711" role="paragraph"><link href="text/scalc/01/04070100.xhp">Sheet - Named Ranges and Expressions - Define</link></paragraph>
<embed href="text/scalc/guide/goalseek.xhp#goalseek"/>
<embed href="text/scalc/guide/relativ_absolut_ref.xhp#relativ_absolut_ref"/>
<embed href="text/scalc/guide/address_auto.xhp#address_auto"/><comment>mw deleted one EMBED paragraph and copied two EMBED paragraphs from Calc guide address_byname.xhp</comment>
diff --git a/source/text/scalc/main0202.xhp b/source/text/scalc/main0202.xhp
index 207ce92fbb..8077985170 100644
--- a/source/text/scalc/main0202.xhp
+++ b/source/text/scalc/main0202.xhp
@@ -65,9 +65,9 @@
<embed href="text/scalc/01/default_number_formats.xhp#add_decimal_place"/>
<embed href="text/scalc/01/default_number_formats.xhp#delete_decimal_place"/>
<embed href="text/shared/02/02130000.xhp#indentdecrease"/>
-<embed href="text/shared/02/02130000.xhp#indentdecreaseicon"/>
+<embed href="text/shared/00/00040502.xhp#sydecrease_ident"/>
<embed href="text/shared/02/02140000.xhp#indentincrease"/>
-<embed href="text/shared/02/02140000.xhp#indentincreaseicon"/>
+<embed href="text/shared/00/00040502.xhp#syincrease_ident"/>
<embed href="text/shared/02/03130000.xhp#borders"/>
<embed href="text/shared/02/03130000.xhp#syborders"/>
<embed href="text/shared/02/02170000.xhp#background_color"/>
diff --git a/source/text/schart/01/three_d_view.xhp b/source/text/schart/01/three_d_view.xhp
index cffb8aa0f6..a696a9e335 100644
--- a/source/text/schart/01/three_d_view.xhp
+++ b/source/text/schart/01/three_d_view.xhp
@@ -154,11 +154,11 @@
<bookmark xml-lang="en-US" branch="hid/modules/schart/ui/tp_3D_SceneIllumination/LB_LIGHTSOURCE" id="bm_id1601611" localize="false"/>
<paragraph xml-lang="en-US" id="par_id2186346" role="paragraph"><ahelp hid="." visibility="hidden">Select a color for the selected light source.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/modules/schart/ui/tp_3D_SceneIllumination/BTN_LIGHTSOURCE_COLOR" id="bm_id733359" localize="false"/>
-<paragraph xml-lang="en-US" id="par_id1331217" role="paragraph"><ahelp hid="." visibility="hidden">Select a color using the color dialog.</ahelp></paragraph><comment>Ambient light</comment>
+<paragraph xml-lang="en-US" id="par_id1331217" role="paragraph"><ahelp hid="." visibility="hidden">Select a color using the Pick a Color dialog.</ahelp></paragraph><comment>Ambient light</comment>
<bookmark xml-lang="en-US" branch="hid/modules/schart/ui/tp_3D_SceneIllumination/LB_AMBIENTLIGHT" id="bm_id1228370" localize="false"/>
<paragraph xml-lang="en-US" id="par_id393993" role="paragraph"><ahelp hid="." visibility="hidden">Select a color for the ambient light.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/modules/schart/ui/tp_3D_SceneIllumination/BTN_AMBIENT_COLOR" id="bm_id879848" localize="false"/>
-<paragraph xml-lang="en-US" id="par_id5871761" role="paragraph"><ahelp hid="." visibility="hidden">Select a color using the color dialog.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_id5871761" role="paragraph"><ahelp hid="." visibility="hidden">Select a color using the Pick a Color dialog.</ahelp></paragraph>
<section id="relatedtopics">
<embed href="text/shared/guide/chart_insert.xhp#chart_insert"/>
<embed href="text/schart/01/wiz_chart_type.xhp#wiz_chart_type"/>
diff --git a/source/text/sdraw/guide/graphic_insert.xhp b/source/text/sdraw/guide/graphic_insert.xhp
index ea0f921f6a..6d9486ce36 100644
--- a/source/text/sdraw/guide/graphic_insert.xhp
+++ b/source/text/sdraw/guide/graphic_insert.xhp
@@ -50,14 +50,11 @@
</list>
<section id="relatedtopics">
<embed href="text/shared/guide/dragdrop_graphic.xhp#dragdrop_graphic"/>
-<embed href="text/shared/guide/dragdrop_fromgallery.xhp#dragdrop_fromgallery"/>
+<embed href="text/shared/guide/gallery_insert.xhp#gallery_insert"/>
<switch select="appl">
<case select="WRITER"><embed href="text/swriter/guide/insert_graphic.xhp#insert_graphic"/>
</case>
</switch>
-<switch select="appl">
-<case select="WRITER"><embed href="text/swriter/guide/insert_graphic_gallery.xhp#insert_graphic_gallery"/>
-</case>
-</switch></section>
+</section>
</body>
</helpdocument>
diff --git a/source/text/sdraw/guide/main.xhp b/source/text/sdraw/guide/main.xhp
index 56679df00e..bb4103d773 100644
--- a/source/text/sdraw/guide/main.xhp
+++ b/source/text/sdraw/guide/main.xhp
@@ -63,7 +63,6 @@
<embed href="text/sdraw/guide/keyboard.xhp#keyboard"/>
<embed href="text/sdraw/guide/graphic_insert.xhp#graphic_insert"/>
<embed href="text/shared/guide/insert_bitmap.xhp#insert_bitmap"/>
-<embed href="text/shared/guide/dragdrop_fromgallery.xhp#dragdrop_fromgallery"/>
<embed href="text/shared/guide/gallery_insert.xhp#gallery_insert"/>
<embed href="text/shared/guide/linestyles.xhp#linestyles"/>
<embed href="text/shared/guide/lineend_define.xhp#lineend_define"/>
diff --git a/source/text/shared/00/00000010.xhp b/source/text/shared/00/00000010.xhp
index 47887d5828..f914484f9d 100644
--- a/source/text/shared/00/00000010.xhp
+++ b/source/text/shared/00/00000010.xhp
@@ -40,11 +40,13 @@
</section>
<section id="insert">
<h2 id="hd_id3149948">Insert</h2>
- <paragraph xml-lang="en-US" role="paragraph" id="par_id3147588">Opens a submenu in the Gallery where you can choose between <emph>Copy</emph> and <emph>Link</emph>. The selected Gallery object is either copied into the current document or a link is created.</paragraph>
- <warning id="par_id3146130">If you have selected an object in your document, then a new insertion will replace the selected object.</warning>
+ <paragraph xml-lang="en-US" role="paragraph" id="par_id3147588">Inserts the selected object into the current document.</paragraph>
</section>
- <bookmark branch="hid/SVX_HID_GALLERY_MN_BACKGROUND" xml-lang="en-US" id="bm_id3156302" localize="false"/><h2 id="hd_id3145829">Background</h2>
+ <section id="insert_as_background"><bookmark branch="hid/SVX_HID_GALLERY_MN_BACKGROUND" xml-lang="en-US" id="bm_id3156302" localize="false"/><h2 id="hd_id3145829">Insert as Background</h2>
<paragraph xml-lang="en-US" role="paragraph" id="par_id3149180"><ahelp hid="HID_GALLERY_MN_BACKGROUND" visibility="visible">Inserts the selected picture as a background graphic.</ahelp> Use the submenu commands <emph>Page</emph> or <emph>Paragraph</emph> to define whether the graphic should cover the entire page or only the current paragraph.</paragraph>
+
+</section>
+
<section id="copy">
<bookmark branch="hid/SID_EXPLORERCONTENT_COPY" xml-lang="en-US" id="bm_id3154751" localize="false"/><h2 id="hd_id3153049">Copy</h2>
<paragraph role="paragraph" id="par_id3150774" xml-lang="en-US"><ahelp hid="SID_EXPLORERCONTENT_COPY" visibility="visible">Copies the selected element to the clipboard.</ahelp></paragraph>
diff --git a/source/text/shared/00/00000401.xhp b/source/text/shared/00/00000401.xhp
index 32907160f3..f6d0c5abf6 100644
--- a/source/text/shared/00/00000401.xhp
+++ b/source/text/shared/00/00000401.xhp
@@ -443,7 +443,14 @@
<paragraph role="paragraph" id="par_id3153701"><variable id="info5">Choose <menuitem>File - Properties - Statistics</menuitem> tab.</variable></paragraph>
<paragraph role="paragraph" id="par_id315370199"><variable id="infosec">Choose <menuitem>File - Properties - Security</menuitem> tab.</variable></paragraph>
<paragraph role="paragraph" id="par_id3149570"><variable id="info6">Choose <menuitem>File - Properties - CMIS Properties</menuitem> tab.</variable></paragraph>
-<paragraph role="paragraph" id="par_id3150382"><variable id="info7">Choose <menuitem>File - Properties - Font</menuitem> tab.</variable></paragraph>
+
+<section id="properties_fonts">
+ <embed href="text/shared/00/00000004.xhp#from_menu_bar"/>
+ <paragraph role="paragraph" id="par_id3150382"><variable id="info7">Choose <menuitem>File - Properties - Font</menuitem> tab.</variable></paragraph>
+ <embed href="text/shared/00/00000004.xhp#from_tabUI"/>
+ <paragraph role="paragraph" id="par_id181713385557802" localize="false"><embedvar href="text/shared/00/00000401.xhp#info7" markup="keep"/></paragraph>
+ <paragraph role="paragraph" id="par_id531713385655322">On the <menuitem>File</menuitem> menu of the <menuitem>File</menuitem> tab, choose <menuitem>Properties - Fonts</menuitem>.</paragraph>
+</section>
<section id="view">
<embed href="text/shared/00/00000004.xhp#from_menu_bar"/>
diff --git a/source/text/shared/00/00040502.xhp b/source/text/shared/00/00040502.xhp
index 04352a5302..a804c19ef3 100644
--- a/source/text/shared/00/00040502.xhp
+++ b/source/text/shared/00/00040502.xhp
@@ -895,6 +895,7 @@
<embed href="text/shared/00/00000004.xhp#from_tabUI"/>
<paragraph role="paragraph" id="par_id51706232106648">Choose <menuitem>Home - Increase Indent</menuitem>.</paragraph>
<embed href="text/shared/00/00000004.xhp#from_toolbars"/>
+ <section id="syincrease_ident">
<table id="tbl_id3157211">
<tablerow>
<tablecell>
@@ -905,6 +906,7 @@
</tablecell>
</tablerow>
</table>
+ </section>
<embed href="text/shared/00/00000004.xhp#from_sidebar"/>
<switch select="appl">
<case select="CALC">
@@ -926,6 +928,7 @@
<embed href="text/shared/00/00000004.xhp#from_tabUI"/>
<paragraph role="paragraph" id="par_id801706232175030">Choose <menuitem>Home - Decrease Indent</menuitem>.</paragraph>
<embed href="text/shared/00/00000004.xhp#from_toolbars"/>
+ <section id="sydecrease_ident">
<table id="tbl_id3157211">
<tablerow>
<tablecell>
@@ -935,7 +938,8 @@
<paragraph role="paragraph" id="par_id151706232182974">Decrease Indent</paragraph>
</tablecell>
</tablerow>
- </table>
+ </table>
+ </section>
<embed href="text/shared/00/00000004.xhp#from_sidebar"/>
<switch select="appl">
<case select="CALC">
diff --git a/source/text/shared/01/01070000.xhp b/source/text/shared/01/01070000.xhp
index dac1f3aeda..9c957955aa 100644
--- a/source/text/shared/01/01070000.xhp
+++ b/source/text/shared/01/01070000.xhp
@@ -77,8 +77,9 @@
</section>
<section id="fpEncryptGPG">
+ <bookmark branch="hid/fps/ui/explorerfiledialog/gpgencrypt" id="bm_id441711998591078" localize="false"/>
<h2 id="hd_id41543592332834">Encrypt with GPG key</h2>
-<paragraph role="paragraph" id="par_id71543592343227">Use OpenPGP public keys to encrypt documents.</paragraph>
+<paragraph role="paragraph" id="par_id71543592343227">Use <link href="text/shared/guide/openpgp.xml">OpenPGP</link> public keys to encrypt documents.</paragraph>
</section>
<bookmark branch="hid/SVT_HID_FILESAVE_CUSTOMIZEFILTER" id="bm_id3147300" localize="false"/>
diff --git a/source/text/shared/01/05020000.xhp b/source/text/shared/01/05020000.xhp
index d7f5f2c31f..47ec078ec3 100644
--- a/source/text/shared/01/05020000.xhp
+++ b/source/text/shared/01/05020000.xhp
@@ -55,8 +55,6 @@
<switch select="appl">
<case select="WRITER">
<embed href="text/shared/01/05020600.xhp#asilayout"/>
-<h2 id="hd_id3147588"><link href="text/shared/01/05020400.xhp">Hyperlink</link></h2>
-<embed href="text/shared/01/05020400.xhp#hyperlinktext"/>
<embed href="text/shared/02/02160000.xhp#character_highlight"/>
</case>
</switch>
diff --git a/source/text/shared/01/05020200.xhp b/source/text/shared/01/05020200.xhp
index cf86190239..412850f5d3 100644
--- a/source/text/shared/01/05020200.xhp
+++ b/source/text/shared/01/05020200.xhp
@@ -57,7 +57,12 @@
<paragraph id="par_id3149205" role="paragraph"><ahelp hid="cui/ui/effectspage/EffectsPage">Specify the font effects that you want to use.</ahelp></paragraph>
</section>
<section id="howtoget">
- <embed href="text/shared/00/00040500.xhp#font_effects"/>
+ <embed href="text/shared/00/00000004.xhp#from_menu_bar"/>
+ <embed href="text/shared/00/00040500.xhp#font_effects"/>
+ <embed href="text/shared/00/00000004.xhp#from_tabUI"/>
+ <paragraph role="paragraph" id="par_id531711633095294">Choose <menuitem>Home</menuitem> then click the <menuitem>Home</menuitem> dropdown on the right-hand side of the tab and choose <menuitem>Character</menuitem>.</paragraph>
+ <embed href="text/shared/00/00000004.xhp#from_context"/>
+ <paragraph role="paragraph" id="par_id891711633731822">Choose <menuitem>Character - Character</menuitem></paragraph>
</section>
<embed href="text/shared/06/shared_cui_screenshots.xhp#fonteffects"/>
<embed href="text/shared/01/05020100.xhp#note"/>
@@ -65,20 +70,7 @@
<section id="FontColor">
<h2 id="hd_id3149482">Font Color</h2>
<paragraph id="par_id3146924" role="paragraph"><ahelp hid="cui/ui/effectspage/fontcolorlb">Sets the color for the selected text. If you select <emph>Automatic</emph>, the text color is set to black for light backgrounds and to white for dark backgrounds.</ahelp></paragraph>
- <list type="unordered">
- <listitem>
- <paragraph id="par_idN10CC2" role="paragraph">To change the color of a text selection, select the text that you want to change, and click the <emph>Font Color</emph> icon. To apply a different color, click the arrow next to the <emph>Font Color</emph> icon, and then select the color that you want to use.</paragraph>
- </listitem>
- <listitem>
- <paragraph id="par_idN10CC9" role="paragraph">If you click the <emph>Font Color</emph> icon before you select text, the paint can cursor appears. To change the color of text, select the text with the paint can cursor. To change the color of a single word, double-click in a word. To apply a different color, click the arrow next to the <emph>Font Color</emph> icon, and then select the color that you want to use.</paragraph>
- </listitem>
- <listitem>
- <paragraph id="par_idN10CD6" role="paragraph">To undo the last change, right-click.</paragraph>
- </listitem>
- <listitem>
- <paragraph id="par_idN10CDA" role="paragraph">To exit the paint can mode, click once, or press the <emph>Esc</emph> key.</paragraph>
- </listitem>
- </list>
+ <paragraph id="par_idN10CC2" role="paragraph">To change the color of a text selection, select the text that you want to change, and click the <emph>Font Color</emph> icon. To apply a different color, click the arrow next to the <emph>Font Color</emph> icon, and then select the color that you want to use.</paragraph>
</section>
<switch select="appl">
<case select="WRITER">
@@ -188,4 +180,4 @@
<paragraph role="paragraph" id="par_id611690210325952" localize="false"><embedvar href="text/shared/01/05200100.xhp#drawingstyles" markup="ignore"/></paragraph>
</section>
</body>
-</helpdocument>
+</helpdocument> \ No newline at end of file
diff --git a/source/text/shared/01/05020400.xhp b/source/text/shared/01/05020400.xhp
deleted file mode 100644
index a81ec1668f..0000000000
--- a/source/text/shared/01/05020400.xhp
+++ /dev/null
@@ -1,143 +0,0 @@
-<?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/.
- *
- * 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 .
- -->
-
-<meta>
- <topic id="textshared0105020400xml" indexer="include" status="PUBLISH">
- <title id="tit" xml-lang="en-US">Hyperlink</title>
- <filename>/text/shared/01/05020400.xhp</filename>
- </topic>
- <history>
- <created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
- </history>
-</meta>
-<body>
-<bookmark xml-lang="en-US" branch="index" id="bm_id3152895"><bookmark_value>formatting; hyperlinks</bookmark_value>
-<bookmark_value>characters; hyperlinks</bookmark_value>
-<bookmark_value>hyperlinks; character formats</bookmark_value>
-<bookmark_value>text;hyperlinks</bookmark_value>
-<bookmark_value>links; character formats</bookmark_value>
-</bookmark>
-<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/charurlpage/@@nowidget@@" id="bm_@@nowidget@@" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/charurlpage/CharURLPage" id="bm_id3153089" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:InsertHyperlinkDlg" id="bm_id3155934" localize="false"/>
-<h1 id="hd_id3152895"><link href="text/shared/01/05020400.xhp">Hyperlink</link></h1>
-<paragraph role="paragraph" id="par_id3149388" xml-lang="en-US"><variable id="hyperlinktext"><ahelp hid=".uno:InsertHyperlinkDlg">Assigns a new hyperlink or edits the selected hyperlink.</ahelp>
-</variable> A hyperlink is a link to a file on the Internet or on your local system.</paragraph>
-<switch select="appl">
-<case select="WRITER">
-<paragraph role="paragraph" id="par_id3145211" xml-lang="en-US">You can also assign or edit a named HTML anchor, or <link href="text/swriter/01/04040000.xhp">Bookmark</link>, that refers to a specific place in a document.</paragraph>
-</case>
-</switch>
-<section id="howtoget">
- <embed href="text/shared/00/00040500.xhp#hyperl"/>
-</section>
-<h2 id="hd_id3147243">Hyperlink</h2>
-<paragraph role="paragraph" id="par_id3156113" xml-lang="en-US">Specify the properties for the hyperlink.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/charurlpage/urled" id="bm_id3148685" localize="false"/>
-<h3 id="hd_id3166410">URL</h3>
-<paragraph role="paragraph" id="par_id3153332" xml-lang="en-US"><variable id="texturl"><ahelp hid="modules/swriter/ui/charurlpage/urled">Enter a <link href="text/shared/00/00000002.xhp#url">URL</link> for the file that you want to open when you click the hyperlink.</ahelp> If you do not specify a target frame, the file opens in the current document or frame.
-</variable></paragraph>
-<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/charurlpage/urlpb" id="bm_id3150771" localize="false"/>
-<h3 id="hd_id3153716">Browse</h3>
-<paragraph role="paragraph" id="par_id3157910" xml-lang="en-US"><ahelp hid="modules/swriter/ui/charurlpage/urlpb">Locate the file that you want to link to, and then click <emph>Open</emph>.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/charurlpage/texted" id="bm_id3159166" localize="false"/>
-<h3 id="hd_id3156152">Reference</h3>
-<paragraph role="paragraph" id="par_id3155450" xml-lang="en-US"><ahelp hid="modules/swriter/ui/charurlpage/texted">Enter the text that you want to display for the hyperlink.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/charurlpage/eventpb" id="bm_id3148491" localize="false"/>
-<h3 id="hd_id3158430">Events</h3>
-<paragraph role="paragraph" id="par_id3153257" xml-lang="en-US"><ahelp hid="modules/swriter/ui/charurlpage/eventpb">Specify an event that triggers when you click the hyperlink.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/charurlpage/nameed" id="bm_id3146847" localize="false"/>
-<h3 id="hd_id3153348">Name</h3>
-<section id="textname">
-<paragraph role="paragraph" id="par_id3156023" xml-lang="en-US"><ahelp hid="modules/swriter/ui/charurlpage/nameed">Enter a name for the hyperlink.</ahelp> $[officename] inserts a NAME tag in the hyperlink:</paragraph>
-<paragraph role="paragraph" id="par_id3148943" xml-lang="en-US">&lt;A HREF="http://www.example.com/" NAME="Nametext" TARGET="_blank"&gt;Note&lt;/A&gt;</paragraph>
-</section>
-<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/charurlpage/targetfrmlb" id="bm_id3146795" localize="false"/>
-<h3 id="hd_id3155923">Frame</h3>
-<section id="textframe2">
-<paragraph role="paragraph" id="par_id3147559" xml-lang="en-US"><variable id="textframe"><ahelp hid="modules/swriter/ui/charurlpage/targetfrmlb">Enter the name of the frame that you want the linked file to open in, or select a predefined frame from the list.</ahelp> If you leave this box blank, the linked file opens in the current browser window.
-</variable></paragraph>
-</section>
-<section id="targets">
-<table id="tbl_id3155829">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablehead" id="par_id3155922" xml-lang="en-US">Name of Frame</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablehead" id="par_id3154924" xml-lang="en-US">Definition</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3159413" xml-lang="en-US">Named entries</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3154935" xml-lang="en-US">File opens in a named frame in the current HTML document.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3148739" localize="false">_self</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3150358" xml-lang="en-US">File opens in the current frame.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3151210" localize="false">_blank</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3152920" xml-lang="en-US">File opens in a new page.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3148451" localize="false">_parent</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3154217" xml-lang="en-US">File opens in the parent frame of the current frame. If there is no parent frame, the current frame is used.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3154153" localize="false">_top</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3150288" xml-lang="en-US">File opens in the topmost frame in the hierarchy.</paragraph>
-</tablecell>
-</tablerow>
-</table>
-</section>
-<h2 id="hd_id3149656">Character Styles</h2>
-<paragraph role="paragraph" id="par_id3148664" xml-lang="en-US">Specify the formatting options for the hyperlink.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/charurlpage/visitedlb" id="bm_id3148740" localize="false"/>
-<h3 id="hd_id3151056">Visited links</h3>
-<paragraph role="paragraph" id="par_id3150359" xml-lang="en-US"><ahelp hid="modules/swriter/ui/charurlpage/visitedlb">Select a formatting style to use for visited links from the list. To add or modify a style in this list, close this dialog, and click the <emph>Styles</emph> icon on the <emph>Formatting</emph> toolbar.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/charurlpage/unvisitedlb" id="bm_id3148676" localize="false"/>
-<h3 id="hd_id3154365">Unvisited links</h3>
-<paragraph role="paragraph" id="par_id3154216" xml-lang="en-US"><ahelp hid="modules/swriter/ui/charurlpage/unvisitedlb">Select a formatting style to use for unvisited links from the list. To add or modify a style in this list, close this dialog, and click the <emph>Styles</emph> icon on the <emph>Formatting</emph> toolbar.</ahelp></paragraph>
-<section id="relatedtopics">
-<paragraph role="paragraph" id="par_id3143231" xml-lang="en-US"><link href="text/shared/02/09070000.xhp">Hyperlink dialog</link></paragraph>
-<paragraph role="paragraph" id="par_id3152933" xml-lang="en-US"><link href="text/swriter/01/05060700.xhp">Assign macro</link></paragraph>
-</section>
-</body>
-</helpdocument>
diff --git a/source/text/shared/01/05020500.xhp b/source/text/shared/01/05020500.xhp
index 903a8f9a33..bc091094a4 100644
--- a/source/text/shared/01/05020500.xhp
+++ b/source/text/shared/01/05020500.xhp
@@ -108,6 +108,11 @@
<h3 id="hd_id3154127"><link href="text/shared/00/00000005.xhp#kerning">Pair kerning</link></h3>
<paragraph role="paragraph" id="par_id3148616"><ahelp hid="cui/ui/positionpage/pairkerning">Automatically adjust the character spacing for specific letter combinations.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id3150010">Kerning is only available for certain font types and requires that your printer support this option.</paragraph>
+<h2 id="hd_id3149822">Hyphenation</h2>
+<paragraph role="paragraph" id="par_id3150013" xml-lang="en-US">Skip <link href="text/swriter/guide/using_hyphen.xhp">hyphenation</link> for selected words.</paragraph>
+<bookmark branch="hid/cui/ui/positionpage/nohyphenation" id="bm_id3153096" localize="false"/>
+<h3 id="hd_id3149823">Exclude from hyphenation</h3>
+<paragraph role="paragraph" id="par_id3150025"><ahelp hid="cui/ui/positionpage/nohyphenation">It prevents hyphenation of the selected word or words in a paragraph hyphenated automatically.</ahelp></paragraph>
<embed href="text/shared/00/00000001.xhp#preview_field"/>
<embed href="text/shared/00/00000001.xhp#reset"/>
<embed href="text/shared/00/00000001.xhp#apply"/>
diff --git a/source/text/shared/01/05020700.xhp b/source/text/shared/01/05020700.xhp
index 600fdaede7..87aad3b7c1 100644
--- a/source/text/shared/01/05020700.xhp
+++ b/source/text/shared/01/05020700.xhp
@@ -34,7 +34,7 @@
<bookmark branch="hid/cui/ui/asiantypography/AsianTypography" id="bm_id3155356" localize="false"/>
<bookmark branch="hid/cui/ui/asiantypography/@@nowidget@@" id="bm_id3155356" localize="false"/>
<h1 id="hd_id3155620"><link href="text/shared/01/05020700.xhp">Asian Typography</link></h1>
-<paragraph role="paragraph" id="par_id3153124"><ahelp hid=".">Set the typographic options for cells or paragraphs in Asian language files. To enable Asian language support, choose <emph>Languages and Locales - General</emph> in the <emph>Options</emph> dialog box, and then select the <emph>Enabled</emph> box in the <emph>Asian language support</emph> area.</ahelp> The Asian typography options are ignored in HTML documents.</paragraph>
+<paragraph role="paragraph" id="par_id3153124"><ahelp hid=".">Set the typographic options for cells or paragraphs in Asian language files. To enable Asian language support, choose <emph>Languages and Locales - General</emph> in the <emph>Options</emph> dialog box, and then select the <emph>Asian</emph> box in the <emph>Default Languages for Documents</emph> area.</ahelp> The Asian typography options are ignored in HTML documents.</paragraph>
</section>
<section id="howtoget">
<embed href="text/shared/00/00040500.xhp#asitypo"/>
diff --git a/source/text/shared/01/06140402.xhp b/source/text/shared/01/06140402.xhp
index fa8f9c64a5..e853ae908d 100644
--- a/source/text/shared/01/06140402.xhp
+++ b/source/text/shared/01/06140402.xhp
@@ -36,7 +36,7 @@
<paragraph role="paragraph" id="par_idN1054B" xml-lang="en-US">Displays the available icons in %PRODUCTNAME. To replace the icon that you selected in the <link href="text/shared/01/06140400.xhp">Customize</link> dialog, click an icon, then click the <emph>OK</emph> button.</paragraph>
<bookmark xml-lang="en-US" branch="hid/cui/ui/iconselectordialog/importButton" id="bm_id1383709" localize="false"/>
<h2 id="par_idN1055C">Import</h2>
-<paragraph role="paragraph" id="par_idN10560" xml-lang="en-US"><ahelp hid=".">Adds new icons to the list of icons. You see a file open dialog that imports the selected icon or icons into the internal icon directory of %PRODUCTNAME.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_idN10560" xml-lang="en-US"><ahelp hid=".">Adds new icons to the list of icons. You see the Open dialog that imports the selected icon or icons into the internal icon directory of %PRODUCTNAME.</ahelp></paragraph>
<paragraph role="note" id="par_idN10575" xml-lang="en-US">You can only import icons that are in the PNG file format and that are 16 × 16 or 24 × 24 pixels in size.</paragraph>
<bookmark xml-lang="en-US" branch="hid/cui/ui/iconselectordialog/deleteButton" id="bm_id1383799" localize="false"/>
<paragraph role="paragraph" id="par_id8224433" xml-lang="en-US"><ahelp hid=".">Click to remove the selected icon from the list. Only user-defined icons can be removed.</ahelp></paragraph>
diff --git a/source/text/shared/01/06140500.xhp b/source/text/shared/01/06140500.xhp
index 63b05a3f51..d5821cc3c2 100644
--- a/source/text/shared/01/06140500.xhp
+++ b/source/text/shared/01/06140500.xhp
@@ -55,7 +55,7 @@
<bookmark branch="hid/cui/ui/macroassignpage/assign" id="bm_id755672891" localize="false"/>
<bookmark branch="hid/cui/ui/eventsconfigpage/macro" id="bm_id752891" localize="false"/>
<h2 id="hd_id3159258">Assign Macro</h2>
-<paragraph role="paragraph" id="par_id3156152"><ahelp hid=".">Opens the <link href="text/shared/01/06130020.xhp">Macro Selector</link> to assign a macro to the selected event.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3156152"><ahelp hid=".">Opens the <link href="text/shared/01/06130020.xhp">Macro Selector</link> dialog to assign a macro to the selected event.</ahelp></paragraph>
<bookmark branch="hid/ cui/ui/assigncomponentdialog/@@nowidget@@" id="bm_id411685039364972" localize="false"/>
<h2 id="hd_id751568966764822">Assign Component...</h2>
<paragraph role="paragraph" id="par_id111568966885228">Opens the <literal>Assign Component</literal> dialog to set a <link href="text/sbasic/python/python_handler.xhp">custom UNO command</link> for the selected event.</paragraph>
diff --git a/source/text/shared/01/DeleteColumns.xhp b/source/text/shared/01/DeleteColumns.xhp
index 6ffcdf36c6..ab1e8901cd 100644
--- a/source/text/shared/01/DeleteColumns.xhp
+++ b/source/text/shared/01/DeleteColumns.xhp
@@ -18,7 +18,7 @@
<body>
<bookmark id="bm_id891693687739389" branch="hid/.uno:DeleteColumns" localize="false"/>
<section id="delete_columns">
- <h1 id="hd_id941693687739390"><variable id="h1"><switchinline select="appl"><caseinline select="WRITER"><link href="text/shared/01/DeleteColumns.xhp">Columns</link></caseinline><caseinline select="CALC"><link href="text/shared/01/DeleteColumns.xhp">Delete Columns</link></caseinline></switchinline></variable></h1>
+ <h1 id="hd_id941693687739390"><variable id="h1"><switchinline select="appl"><caseinline select="WRITER"><link href="text/shared/01/DeleteColumns.xhp">Columns</link></caseinline><defaultinline><link href="text/shared/01/DeleteColumns.xhp">Delete Columns</link></defaultinline></switchinline></variable></h1>
<paragraph id="par_idN10616" role="paragraph">Deletes the selected columns.</paragraph>
</section>
<section id="howtoget">
diff --git a/source/text/shared/01/DeleteRows.xhp b/source/text/shared/01/DeleteRows.xhp
index 2075f8e195..54f03c2854 100644
--- a/source/text/shared/01/DeleteRows.xhp
+++ b/source/text/shared/01/DeleteRows.xhp
@@ -18,7 +18,7 @@
<body>
<bookmark id="bm_id891693687739389" branch="hid/.uno:DeleteRows" localize="false"/>
<section id="delete_rows">
- <h1 id="hd_id941693687739390"><variable id="h1"><switchinline select="appl"><caseinline select="WRITER"> <link href="text/shared/01/DeleteRows.xhp">Rows</link></caseinline><caseinline select="CALC"><link href="text/shared/01/DeleteRows.xhp">Delete Rows</link></caseinline></switchinline></variable></h1>
+ <h1 id="hd_id941693687739390"><variable id="h1"><switchinline select="appl"><caseinline select="WRITER"><link href="text/shared/01/DeleteRows.xhp">Rows</link></caseinline><defaultinline><link href="text/shared/01/DeleteRows.xhp">Delete Rows</link></defaultinline></switchinline></variable></h1>
<paragraph id="par_idN10616" role="paragraph">Deletes the selected rows.</paragraph>
</section>
<section id="howtoget">
diff --git a/source/text/shared/01/DeleteTable.xhp b/source/text/shared/01/DeleteTable.xhp
index 810b877043..a47587de93 100644
--- a/source/text/shared/01/DeleteTable.xhp
+++ b/source/text/shared/01/DeleteTable.xhp
@@ -18,7 +18,7 @@
<body>
<bookmark id="bm_id891693687739389" branch="hid/.uno:DeleteTable" localize="false"/>
<section id="delete_table">
- <h1 id="hd_id941693687739390"><variable id="h1"><link href="text/shared/01/DeleteTable.xhp">Table</link></variable></h1>
+ <h1 id="hd_id941693687739390"><variable id="h1"><link href="text/shared/01/DeleteTable.xhp">Delete Table</link></variable></h1>
<paragraph id="par_idN10616" role="paragraph">Deletes the current table.</paragraph>
</section>
<section id="howtoget">
diff --git a/source/text/shared/01/SelectTable.xhp b/source/text/shared/01/SelectTable.xhp
index 0441953354..7c9327a113 100644
--- a/source/text/shared/01/SelectTable.xhp
+++ b/source/text/shared/01/SelectTable.xhp
@@ -18,7 +18,7 @@
<body>
<bookmark id="bm_id891693687739389" branch="hid/.uno:SelectTable" localize="false"/>
<section id="select_table">
- <h1 id="hd_id941693687739390"><variable id="h1"><link href="text/shared/01/SelectTable.xhp">Table</link></variable></h1>
+ <h1 id="hd_id941693687739390"><variable id="h1"><link href="text/shared/01/SelectTable.xhp">Select Table</link></variable></h1>
<paragraph role="paragraph" id="par_idN10626">Selects the current table.</paragraph>
</section>
<section id="howtoget">
diff --git a/source/text/shared/01/SetOptimalRowHeight.xhp b/source/text/shared/01/SetOptimalRowHeight.xhp
index 18174368b6..bdc56accf4 100644
--- a/source/text/shared/01/SetOptimalRowHeight.xhp
+++ b/source/text/shared/01/SetOptimalRowHeight.xhp
@@ -35,11 +35,8 @@
<case select="CALC">
<paragraph role="paragraph" id="par_id3154758" ><variable id="optitext"><ahelp hid=".uno:SetOptimalRowHeight">Determines the optimal row height for the selected rows.</ahelp></variable> The optimal row height depends on the font size of the largest character in the row. You can use various <link href="text/shared/00/00000003.xhp#measurement_units">units of measure</link>.</paragraph>
</case>
- <case select="IMPRESS">
- </case>
- <case select="DRAW">
- </case>
<default>
+ <paragraph role="paragraph" id="par_id441713804246210">Set row height for selected table rows so that each row has the same height as the row with the tallest content.</paragraph>
</default>
</switch>
</section>
diff --git a/source/text/shared/01/certificatepath.xhp b/source/text/shared/01/certificatepath.xhp
index 56f0391694..2321cffa0e 100644
--- a/source/text/shared/01/certificatepath.xhp
+++ b/source/text/shared/01/certificatepath.xhp
@@ -37,7 +37,7 @@
<bookmark id="bm_id191594763815173" xml-lang="en-US" branch="hid/cui/ui/certdialog/CertDialog/add" localize="false"/>
<h2 id="hd_id741594764591263">Select NSS path</h2>
-<paragraph role="paragraph" id="par_id851594766090600"><ahelp hid="cui/ui/certdialog/CertDialog/add">Opens a file picker dialog to add a new Network Security Services Certificate directory to the list.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id851594766090600"><ahelp hid="cui/ui/certdialog/CertDialog/add">Opens the Select Path dialog to add a new Network Security Services Certificate directory to the list.</ahelp></paragraph>
<section id="relatedtopics">
<embed href="text/shared/guide/digital_signatures.xhp#digital_signatures"/>
</section>
diff --git a/source/text/shared/01/gallery.xhp b/source/text/shared/01/gallery.xhp
index 34ace37727..7ab9e9b443 100644
--- a/source/text/shared/01/gallery.xhp
+++ b/source/text/shared/01/gallery.xhp
@@ -26,11 +26,13 @@
</meta>
<body>
+<bookmark branch="index" id="bm_id621711721620413">
+ <bookmark_value>Gallery; opening</bookmark_value>
+ <bookmark_value>Gallery; context menu</bookmark_value>
+ <bookmark_value>Gallery; themes</bookmark_value>
+ <bookmark_value>Gallery; new theme</bookmark_value>
+</bookmark>
-<bookmark branch="hid/svx/ui/sidebargallery/icon" id="bm_id3146946" localize="false"/>
-<paragraph id="par_id3149783" role="paragraph"><ahelp hid="." visibility="hidden">Displays the contents of the <emph>Gallery </emph>as icons.</ahelp></paragraph>
-<bookmark branch="hid/svx/ui/sidebargallery/list" id="bm_id3152821" localize="false"/>
-<paragraph id="par_id3148983" role="paragraph"><ahelp hid="." visibility="hidden">Displays the contents of the <emph>Gallery </emph>as small icons, with title and path information.</ahelp></paragraph>
<section id="media_gallery">
@@ -38,13 +40,10 @@
<bookmark branch="hid/.uno:Gallery" id="bm_id2975847" localize="false"/>
<bookmark branch="hid/SIDEBAR_GALLERYDECK" id="bm_id331702908948474" localize="false"/>
-<h1 id="hd_id3153894"><link href="text/shared/01/gallery.xhp">Gallery</link></h1>
+<h1 id="hd_id3153894"><variable id="media_gallery_h1"><link href="text/shared/01/gallery.xhp">Gallery</link></variable></h1>
<paragraph id="par_id3150789" role="paragraph"><variable id="media_gallery_text"><ahelp hid=".">Opens the Gallery deck of the Sidebar, where you can select images and audio clips to insert into your document.</ahelp></variable></paragraph>
</section>
</section>
-<paragraph id="par_id3155555" role="paragraph">You can display the contents of the <emph>Gallery </emph>as icons, or icons with titles and path information.</paragraph>
-<paragraph id="par_id3153394" role="paragraph">To zoom in or zoom out on a single object in the <emph>Gallery</emph>, double-click the object, or select the object, and then press the Spacebar.</paragraph>
-
<section id="howtoget">
<switch select="appl">
<case select="MATH"/>
@@ -54,6 +53,8 @@
<paragraph role="paragraph" id="par_id3146765" xml-lang="en-US">Choose <menuitem>View - Gallery</menuitem>.</paragraph>
<embed href="text/shared/00/00000004.xhp#from_tabUI"/>
<paragraph role="paragraph" id="par_id561687042574900">Choose <menuitem>Insert - Gallery</menuitem>.</paragraph>
+ <embed href="text/shared/00/00000004.xhp#from_keyboard"/>
+ <paragraph role="paragraph" id="par_id581711550086281"><switchinline select="sys"><caseinline select="MAC"><keycode>Option</keycode></caseinline><defaultinline><keycode>Alt</keycode></defaultinline></switchinline><keycode> + 3</keycode></paragraph>
<embed href="text/shared/00/00000004.xhp#from_toolbars"/>
<section id="sygallery">
<table id="tbl_id3147273">
@@ -70,36 +71,62 @@
</default>
</switch>
</section>
+<paragraph id="par_id3155555" role="paragraph">You can display the contents of the <emph>Gallery </emph>as icons, or icons with titles and path information.</paragraph>
+<paragraph id="par_id3153394" role="paragraph">To zoom in or zoom out on a single object in the <emph>Gallery</emph>, double-click the object, or select the object, and then press the Spacebar.</paragraph>
+<bookmark branch="hid/SVX_HID_GALLERY_THEMELIST" id="bm_id3150774" localize="false"/>
+<paragraph id="par_id3145346" role="paragraph">Themes are listed on the left side of the <emph>Gallery</emph>. <ahelp hid="SVX_HID_GALLERY_THEMELIST">Click a theme to view the objects associated with the theme.</ahelp></paragraph>
+<bookmark branch="hid/SVX_HID_GALLERY_WINDOW" id="bm_id3157958" localize="false"/>
+<paragraph id="par_id3155355" role="paragraph"><ahelp hid="SVX_HID_GALLERY_WINDOW">To insert a <emph>Gallery </emph>object, select the object, and then drag it into the document.</ahelp></paragraph>
+ <h2 id="hd_id41711735303911">Themes context menu</h2>
+ <paragraph id="par_id3159167" role="paragraph">To access the following commands, right-click a theme in the <emph>Gallery</emph>:</paragraph>
+ <embed href="text/shared/00/00000010.xhp#update"/>
+ <embed href="text/shared/00/00000010.xhp#delete"/>
+ <bookmark branch="hid/svx/ui/gallerymenu1/rename" id="bm_id411711738593390" localize="false"/>
-<bookmark branch="hid/svx/ui/sidebargallery/themelist" id="bm_id3150774" localize="false"/>
-<paragraph id="par_id3145346" role="paragraph">Themes are listed on the left side of the <emph>Gallery</emph>.<ahelp hid=".">Click a theme to view the objects associated with the theme.</ahelp></paragraph>
-<bookmark branch="hid/svx/ui/sidebargallery/galleryscroll" id="bm_id3157958" localize="false"/>
-<bookmark branch="hid/svx/ui/sidebargallery/gallerylist" id="bm_id3157959" localize="false"/>
-<paragraph id="par_id3155355" role="paragraph"><ahelp hid=".">To insert a <emph>Gallery </emph>object, select the object, and then drag it into the document.</ahelp></paragraph>
-<embed href="text/shared/guide/gallery_insert.xhp#gallery_insert"/>
-<embed href="text/shared/guide/dragdrop_fromgallery.xhp#dragdrop_fromgallery"/>
-<embed href="text/shared/guide/dragdrop_gallery.xhp#dragdrop_gallery"/>
-
-<h3 id="hd_id3156113">Adding a New File to the Gallery</h3>
-<paragraph id="par_id3153032" role="paragraph">To add a file to the <emph>Gallery</emph>, right-click a theme, choose <emph>Properties</emph>, click the <emph>Files</emph> tab, and then click <emph>Add</emph>. You can also click an object in the current document, hold, and then drag it to the <emph>Gallery</emph> window.</paragraph>
+ <embed href="text/shared/00/00000010.xhp#rename"/>
+<h3 id="hd_id3154142">Properties</h3>
+<paragraph id="par_id3148990" role="paragraph">The <emph>Properties</emph> dialog contains the following tabs:</paragraph>
+ <h4 id="hd_id901711736039528"><link href="text/shared/00/01050000.xhp">General</link></h4>
+<embed href="text/shared/00/01050000.xhp#par_id3159242"/>
+<h4 id="hd_id3151384"><link href="text/shared/01/gallery_files.xhp">Files</link></h4>
+<embed href="text/shared/01/gallery_files.xhp#stargallerymanager"/>
+ <h2 id="hd_id741711735329999">Object context menu</h2>
+ <paragraph role="paragraph" id="par_id221711737517487">To access the following commands, right-click an object in the <emph>Gallery</emph>:</paragraph>
+ <embed href="text/shared/00/00000010.xhp#insert"/>
+ <switch select="appl">
+ <case select="WRITER">
+ <embed href="text/shared/00/00000010.xhp#insert_as_background"/>
+ </case>
+</switch>
+ <bookmark branch="hid/svx/ui/gallerymenu2/preview)" id="bm_id751711738097220" localize="false"/>
+ <embed href="text/shared/00/00000010.xhp#preview"/>
+ <bookmark branch="svx/ui/gallerymenu2/title" id="bm_id581711738217617" localize="false"/>
+ <h3 id="hd_id241711736368130">Title</h3>
+ <paragraph role="paragraph" id="par_id801711736385660">Changes the title of the selected object. After selecting <menuitem>Title</menuitem> the name is selected and a new one can be entered directly. Use the arrow keys to set the cursor at the beginning or end of the name to delete or add to part of the name or to reposition the cursor.</paragraph>
+ <bookmark branch="hid/svx/ui/gallerymenu2/delete" id="bm_id841711738460660" localize="false"/>
-<h2 id="hd_id3145315">New theme</h2>
-<bookmark branch="hid/svx/ui/sidebargallery/insert" id="bm_id3154381" localize="false"/>
-<paragraph id="par_id3150275" role="paragraph"><ahelp hid=".">Adds a new theme to the <emph>Gallery</emph> and lets you choose the files to include in the theme.</ahelp></paragraph>
-<paragraph id="par_id3159167" role="paragraph">To access the following commands, right-click a theme in the <emph>Gallery</emph>:</paragraph>
-<embed href="text/shared/00/00000010.xhp#delete"/>
-<embed href="text/shared/00/00000010.xhp#delete2"/>
-<embed href="text/shared/00/00000010.xhp#rename"/>
-<embed href="text/shared/00/00000010.xhp#update"/>
+ <embed href="text/shared/00/00000010.xhp#delete"/>
+ <embed href="text/shared/00/00000010.xhp#delete2"/>
+ <bookmark branch="svx/ui/gallerymenu2/copy" id="bm_id101711738287627" localize="false"/>
+ <embed href="text/shared/00/00000010.xhp#copy"/>
+ <bookmark branch="hid/CHANGE ME(path/to/dialog/widget)" id="bm_id261711738304848" localize="false"/>
+<bookmark branch="hid/svx/ui/gallerymenu2/paste" id="bm_id911711738319047" localize="false"/>
+ <embed href="text/shared/00/00000010.xhp#paste"/>
+ <bookmark branch="hid/SVX_HID_GALLERY_ICONVIEW" id="bm_id3146946" localize="false"/>
+ <h2 id="hd_id621711984540725">Icon View</h2>
+ <paragraph id="par_id3149783" role="paragraph"><ahelp hid="SVX_HID_GALLERY_ICONVIEW">Displays the contents of the <emph>Gallery </emph>as icons.</ahelp></paragraph>
+ <bookmark branch="hid/SVX_HID_GALLERY_LISTVIEW" id="bm_id3152821" localize="false"/>
+ <h2 id="hd_id961711984651481">Detailed View</h2>
+ <paragraph id="par_id3148983" role="paragraph"><ahelp hid="SVX_HID_GALLERY_LISTVIEW">Displays the contents of the <emph>Gallery </emph>as small icons, with title and path information.</ahelp></paragraph>
-<h2 id="hd_id3154142">Properties</h2>
-<paragraph id="par_id3148990" role="paragraph">The <emph>Properties of (Theme)</emph> dialog contains the following tabs:</paragraph>
-<embed href="text/shared/00/01050000.xhp#general"/>
+ <h2 id="hd_id3145315">New</h2>
+<paragraph id="par_id3150275" role="paragraph"><ahelp hid="SVX_HID_GALLERY_NEWTHEME">Adds a new theme to the <emph>Gallery</emph> and lets you choose the files to include in the theme.</ahelp></paragraph>
+
+<section id="relatedtopics">
+ <embed href="text/shared/guide/gallery_insert.xhp#gallery_insert"/>
+ <embed href="text/shared/guide/dragdrop_gallery.xhp#dragdrop_gallery"/>
+</section>
-<h2 id="hd_id3151384"><link href="text/shared/01/gallery_files.xhp">Files</link></h2>
-<embed href="text/shared/01/gallery_files.xhp#stargallerymanager"/>
-<embed href="text/shared/00/00000010.xhp#insert"/>
-<embed href="text/shared/00/00000010.xhp#preview"/>
</body>
</helpdocument>
diff --git a/source/text/shared/01/notebook_bar.xhp b/source/text/shared/01/notebook_bar.xhp
index 02a0533b59..abf0407faf 100644
--- a/source/text/shared/01/notebook_bar.xhp
+++ b/source/text/shared/01/notebook_bar.xhp
@@ -40,6 +40,7 @@
</bookmark>
<bookmark branch="hid/.uno:ToolbarModeUI" id="bm_id601696601303603" localize="false"/>
+<bookmark branch="hid/cui/ui/toolbarmodedialog/dialog-action_area" id="bm_id971713389496388" localize="false"/>
<section id="using_the_notebook_bar">
<h1 id="hd_id190920161731349683"><link href="text/shared/01/notebook_bar.xhp">User Interface</link></h1>
<paragraph role="paragraph" id="par_id791612306305954">Opens the <emph>Select Your Preferred User Interface</emph> dialog to let you choose the user interface layout for %PRODUCTNAME.</paragraph>
@@ -56,25 +57,25 @@
<h2 id="hd_id190920161911374012">User interface layouts</h2>
<paragraph id="par_id190920161744068946" role="paragraph">The <emph>User Interface</emph> entry defines which user interface elements are visible.</paragraph>
-
+<bookmark branch="hid/cui/ui/toolbarmodedialog/rbButton1" id="bm_id171713388212043" localize="false"/>
<h3 id="par_id190920161744068819">Standard toolbar</h3>
<paragraph role="paragraph" id="par_id851612307031565">Classic mode with two visible toolbars – standard and formatting. The sidebar is partially collapsed and shows only tabs. Intended for users who are familiar with the classic interface.</paragraph>
-
+<bookmark branch="hid/cui/ui/toolbarmodedialog/rbButton2" id="bm_id551713388179708" localize="false"/>
<h3 id="par_id190920161744069064">Tabbed</h3>
<paragraph role="paragraph" id="par_id651612308171162">In this mode, the bar is divided into tabs, where each tab displays a set of icons grouped by context. The context can also change depending on the object selected in the document, for example a table or an image. The Tabbed user interface is the most similar to the Ribbons used in Microsoft Office. It organizes functions in tabs and makes the main menu obsolete.</paragraph>
-
+<bookmark branch="hid/cui/ui/toolbarmodedialog/rbButton5" id="bm_id511713388326642" localize="false"/>
<h3 id="hd_id121612308178510">Tabbed compact</h3>
<paragraph role="paragraph" id="par_id91612308184979">The Tabbed Compact variant aims to be familiar with the Microsoft Office interface, yet occupying less space for smaller screens.</paragraph>
-
+<bookmark branch="hid/cui/ui/toolbarmodedialog/rbButton7" id="bm_id591713388349327" localize="false"/>
<h3 id="hd_id701612308190664">Groupedbar compact</h3>
<paragraph role="paragraph" id="par_id381612308201500">The Groupedbar Compact interface provides access to functions in groups, with icons for most-frequently used features, and dropdown menus for others. This compact variant favors vertical space.</paragraph>
-
+<bookmark branch="hid/cui/ui/toolbarmodedialog/rbButton8" id="bm_id421713388368511" localize="false"/>
<h3 id="par_id190920161744063712">Contextual single</h3>
<paragraph role="paragraph" id="par_id581612307790744">The Contextual Single interface shows functions in a single-line toolbar with context-dependent content.</paragraph>
-
+<bookmark branch="hid/cui/ui/toolbarmodedialog/rbButton3" id="bm_id691713388236187" localize="false"/>
<h3 id="par_id190920161744061192">Single toolbar</h3>
<paragraph role="paragraph" id="par_id531612307932017">Standard user interface but with single-line toolbar. Intended for use on small screens. The sidebar is collapsed.</paragraph>
-
+<bookmark branch="hid/cui/ui/toolbarmodedialog/rbButton4" id="bm_id981713388270160" localize="false"/>
<h3 id="par_id190920161744069136">Sidebar</h3>
<paragraph role="paragraph" id="par_id411612308221445">Standard user interface with expanded sidebar. Expert users who want to quickly change many different properties are advised to use this user interface.</paragraph>
diff --git a/source/text/shared/01/prop_font_embed.xhp b/source/text/shared/01/prop_font_embed.xhp
index 7d63fc574d..18bf7af55d 100644
--- a/source/text/shared/01/prop_font_embed.xhp
+++ b/source/text/shared/01/prop_font_embed.xhp
@@ -11,13 +11,12 @@
<meta>
<topic id="textsharedembedfontxml" indexer="include" status="PUBLISH">
- <title xml-lang="en-US" id="tit">Embedding Fonts</title>
+ <title id="tit">Embedding Fonts</title>
<filename>/text/shared/01/prop_font_embed.xhp</filename>
</topic>
</meta>
-<body>
- <section id="font">
-<bookmark xml-lang="en-US" branch="index" id="bm_id3149955">
+ <body>
+ <bookmark branch="index" id="bm_id3149955">
<bookmark_value>embedding fonts in document file</bookmark_value>
<bookmark_value>documents; embedding fonts</bookmark_value>
<bookmark_value>font embedding; in documents</bookmark_value>
@@ -25,19 +24,28 @@
<bookmark_value>fonts; licensing for embedding</bookmark_value>
<bookmark_value>embedding; fonts</bookmark_value>
<bookmark_value>embedding licensed fonts</bookmark_value>
-</bookmark>
- <bookmark xml-lang="en-US" branch="hid/sfx/ui/documentfontspage/@@nowidget@@" id="bm_@@nowidget@@" localize="false"/>
- <bookmark xml-lang="en-US" branch="hid/sfx/ui/documentfontspage/DocumentFontsPage" id="bm_id3154926" localize="false"/>
- <h1 id="hd_id3148668"><link href="text/shared/01/prop_font_embed.xhp">Font</link></h1>
- <paragraph xml-lang="en-US" id="par_id3154863" role="paragraph"><ahelp hid="sfx/ui/documentfontspage/DocumentFontsPage">Embed document fonts in the current file.</ahelp></paragraph>
- </section>
- <section id="howtoget">
- <embed href="text/shared/00/00000401.xhp#info7"/>
- </section>
- <bookmark xml-lang="en-US" branch="hid/sfx/ui/documentinfopage/embedFonts" id="bm_id3149283" localize="false"/>
- <h2 id="hd_id3149999">Font embedding</h2>
- <paragraph xml-lang="en-US" id="par_id3153114" role="paragraph"><ahelp hid="sfx/ui/documentfontspage/embedFonts">Mark this box to embed document fonts into the document file, for portability between different computer systems.</ahelp> The document with embedded fonts has a larger size and the fonts are used on the target computer for better rendering of the document layout.</paragraph>
- <paragraph xml-lang="en-US" id="par_id3153115" role="paragraph">Consider embedding fonts when your document use rare or custom fonts not generally available in other computers.</paragraph>
- <warning id="par_id191616163803305">Font licenses may restrict embedding fonts in documents. Font files contain flags that indicate if and how they can be embedded within a document file. %PRODUCTNAME parses these flags and determines if and how it may be embedded in a document file, and when you open a document containing embedded fonts, it will also look at these flags to determine if and how a document can be viewed or edited.</warning>
+ </bookmark>
+<bookmark branch="hid/sfx/ui/documentfontspage/@@nowidget@@" id="bm_@@nowidget@@" localize="false"/>
+<bookmark branch="hid/sfx/ui/documentfontspage/DocumentFontsPage" id="bm_id3154926" localize="false"/>
+<section id="font">
+ <h1 id="hd_id3148668"><link href="text/shared/01/prop_font_embed.xhp">Font</link></h1>
+ <paragraph id="par_id3154863" role="paragraph"><ahelp hid="sfx/ui/documentfontspage/DocumentFontsPage">Embed document fonts in the current file.</ahelp></paragraph>
+</section>
+<paragraph id="par_id3153115" role="paragraph">Consider embedding fonts when your document use rare or custom fonts not generally available in other computers.</paragraph>
+<section id="howtoget">
+ <embed href="text/shared/00/00000401.xhp#properties_fonts"/>
+</section>
+<bookmark branch="hid/sfx/ui/documentinfopage/embedFonts" id="bm_id3149283" localize="false"/>
+<h2 id="hd_id3149999">Font embedding</h2>
+<h3 id="hd_id91713382611498">Embed fonts in the document</h3>
+<paragraph id="par_id3153114" role="paragraph"><ahelp hid="sfx/ui/documentfontspage/embedFonts">Mark this box to embed document fonts into the document file, for portability between different computer systems.</ahelp> All fonts referenced in styles or direct formatting are embedded, even if the style is not applied in the document.</paragraph>
+<h3 id="hd_id271713382605686">Only embed fonts that are used in the document</h3>
+<paragraph role="paragraph" id="par_id851713384397434">Mark this box to embed fonts used in the document and filter out unused fonts. The fonts are embedded if they are used in an applied style or in direct formatting only.</paragraph>
+<note id="par_id741713382637243">The document with embedded fonts has a larger size and the fonts are used on the target computer for better rendering of the document layout.</note>
+
+<h2 id="hd_id401713382497446">Font scripts to embed</h2>
+<h3 id="hd_id771713384803066">Latin, Asian and Complex fonts</h3>
+<paragraph role="paragraph" id="par_id691713384968030">Mark the appropriate font script to embed in the document.</paragraph>
+<warning id="par_id191616163803305">Font licenses may restrict embedding fonts in documents. Font files contain flags that indicate if and how they can be embedded within a document file. %PRODUCTNAME parses these flags and determines if and how it may be embedded in a document file, and when you open a document containing embedded fonts, it will also look at these flags to determine if and how a document can be viewed or edited.</warning>
</body>
</helpdocument>
diff --git a/source/text/shared/guide/digital_signatures.xhp b/source/text/shared/guide/digital_signatures.xhp
index 6bd0633073..2e79ccc6c6 100644
--- a/source/text/shared/guide/digital_signatures.xhp
+++ b/source/text/shared/guide/digital_signatures.xhp
@@ -21,89 +21,84 @@
<meta>
<topic id="textsharedguidedigital_signaturesxhp" indexer="include">
- <title xml-lang="en-US" id="tit">About Digital Signatures</title>
+ <title id="tit">About Digital Signatures</title>
<filename>/text/shared/guide/digital_signatures.xhp</filename>
</topic>
</meta>
<body>
-<bookmark xml-lang="en-US" branch="index" id="bm_id7430951"><bookmark_value>certificates</bookmark_value>
- <bookmark_value>digital signatures;overview</bookmark_value>
- <bookmark_value>security;digital signatures</bookmark_value>
+<bookmark branch="index" id="bm_id7430951"><bookmark_value>certificates</bookmark_value>
+<bookmark_value>digital signatures;overview</bookmark_value>
+<bookmark_value>security;digital signatures</bookmark_value>
</bookmark><comment>mw moved 1 entry to digitalsign_send.xhp and made "digital signatures" a two level entry and added a new entry</comment>
<h1 id="hd_id2767418"><variable id="digital_signatures"><link href="text/shared/guide/digital_signatures.xhp">About Digital Signatures</link>
</variable></h1>
- <paragraph xml-lang="en-US" id="par_idN10632" role="paragraph">In %PRODUCTNAME, you can digitally sign your documents and macros. </paragraph>
+ <paragraph id="par_idN10632" role="paragraph">In %PRODUCTNAME, you can digitally sign your documents and macros. </paragraph>
<h2 id="hd_id6564531">Certificates</h2>
- <paragraph xml-lang="en-US" id="par_idN10639" role="paragraph">To sign a document digitally, you need a personal key, the certificate. A personal key is stored on your computer as a combination of a private key, which must be kept secret, and a public key, which you add to your documents when you sign them.</paragraph>
+ <paragraph id="par_idN10639" role="paragraph">To sign a document digitally, you need a personal key, the certificate. A personal key is stored on your computer as a combination of a private key, which must be kept secret, and a public key, which you add to your documents when you sign them.</paragraph>
<h2 id="par_idN1066D">Save and sign the document</h2>
- <paragraph xml-lang="en-US" id="par_idN10671" role="paragraph">When you apply a digital signature to a document, a kind of checksum is computed from the document's content plus your personal key. The checksum and your public key are stored together with the document.</paragraph>
+ <paragraph id="par_idN10671" role="paragraph">When you apply a digital signature to a document, a kind of checksum is computed from the document's content plus your personal key. The checksum and your public key are stored together with the document.</paragraph>
<h2 id="par_idN10674">Open a signed document</h2>
- <paragraph xml-lang="en-US" id="par_idN10678" role="paragraph">When someone later opens the document on any computer with a recent version of %PRODUCTNAME, the program will compute the checksum again and compare it with the stored checksum. If both are the same, the program will signal that you see the original, unchanged document. In addition, the program can show you the public key information from the certificate.</paragraph>
- <paragraph xml-lang="en-US" id="par_idN1067B" role="paragraph">You can compare the public key with the public key that is published on the web site of the certificate authority.</paragraph>
- <paragraph xml-lang="en-US" id="par_idN1067E" role="paragraph">Whenever someone changes something in the document, this change breaks the digital signature. After the change, there will be no sign that you see the original document.</paragraph>
- <paragraph xml-lang="en-US" id="par_id2008200911381426" role="paragraph">The result of the signature validation is displayed in the status bar and within the Digital Signature dialog. Several documents and macro signatures can exist inside an ODF document. If there is a problem with one signature, then the validation result of that one signature is assumed for all signatures. That is, if there are ten valid signatures and one invalid signature, then the status bar and the status field in the dialog will flag the signature as invalid.</paragraph>
- <paragraph xml-lang="en-US" id="par_id0821200911571878" role="paragraph">You can see any of the following icons and messages when you open a signed document.</paragraph>
+ <paragraph id="par_idN10678" role="paragraph">When someone later opens the document on any computer with a recent version of %PRODUCTNAME, the program will compute the checksum again and compare it with the stored checksum. If both are the same, the program will signal that you see the original, unchanged document. In addition, the program can show you the public key information from the certificate.</paragraph>
+ <paragraph id="par_idN1067B" role="paragraph">You can compare the public key with the public key that is published on the web site of the certificate authority.</paragraph>
+ <paragraph id="par_idN1067E" role="paragraph">Whenever someone changes something in the document, this change breaks the digital signature. After the change, there will be no sign that you see the original document.</paragraph>
+ <paragraph id="par_id2008200911381426" role="paragraph">The result of the signature validation is displayed in the status bar and within the Digital Signature dialog. Several documents and macro signatures can exist inside an ODF document. If there is a problem with one signature, then the validation result of that one signature is assumed for all signatures. That is, if there are ten valid signatures and one invalid signature, then the status bar and the status field in the dialog will flag the signature as invalid.</paragraph>
+ <paragraph id="par_id0821200911571878" role="paragraph">You can see any of the following icons and messages when you open a signed document.</paragraph>
<table id="tbl_id0821200912400398">
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id0821200912504050" role="tablehead">Icon in Status bar</paragraph>
+ <paragraph id="par_id0821200912504050" role="tablehead">Icon in Status bar</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id0821200912504061" role="tablehead">Signature status</paragraph>
+ <paragraph id="par_id0821200912504061" role="tablehead">Signature status</paragraph>
</tablecell>
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id0821200912504010" role="tablecontent">
-<image id="img_id0821200912421569" src="xmlsecurity/res/certificate_16.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id0821200912421569">Icon</alt>
- </image></paragraph>
+ <paragraph id="par_id0821200912504010" role="tablecontent"><image id="img_id0821200912421569" src="xmlsecurity/res/certificate_16.svg" width="1cm" height="1cm"><alt id="alt_id0821200912421569">Icon</alt></image></paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id0821200912504189" role="tablecontent">The signature is valid.</paragraph>
+ <paragraph id="par_id0821200912504189" role="tablecontent">The signature is valid.</paragraph>
</tablecell>
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id082120091250418" role="tablecontent">
-<image id="img_id0821200912431081" src="xmlsecurity/res/notcertificate_16.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id0821200912431081">Icon</alt>
- </image></paragraph>
+ <paragraph id="par_id082120091250418" role="tablecontent"><image id="img_id0821200912431081" src="xmlsecurity/res/notcertificate_16.svg" width="1cm" height="1cm"><alt id="alt_id0821200912431081">Icon</alt></image></paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id0821200912504133" role="tablecontent">The signature is OK, but the certificates could not be validated.</paragraph>
- <paragraph xml-lang="en-US" id="par_id0821200912504165" role="tablecontent">The signature and the certificate are OK, but not all parts of the document are signed. (For documents that were signed with old versions of the software, see note below.)</paragraph>
+ <paragraph id="par_id0821200912504133" role="tablecontent">The signature is OK, but the certificates could not be validated.</paragraph>
+ <paragraph id="par_id0821200912504165" role="tablecontent">The signature and the certificate are OK, but not all parts of the document are signed. (For documents that were signed with old versions of the software, see note below.)</paragraph>
</tablecell>
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id0821200912504237" role="tablecontent">
-<image id="img_id0821200912435090" src="svx/res/caution_11x16.png" width="0.1665in" height="0.1146in"><alt xml-lang="en-US" id="alt_id0821200912435090">Icon</alt>
- </image></paragraph>
+ <paragraph id="par_id0821200912504237" role="tablecontent">
+<image id="img_id0821200912435090" src="svx/res/caution_11x16.png" width="1cm" height="1cm"><alt id="alt_id0821200912435090">Icon</alt></image></paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id0821200912504233" role="tablecontent">The signature is invalid.</paragraph>
+ <paragraph id="par_id0821200912504233" role="tablecontent">The signature is invalid.</paragraph>
</tablecell>
</tablerow>
</table>
<h3 id="hd_id0821200910191787">Signatures and software versions</h3>
- <paragraph xml-lang="en-US" id="par_id0821200910191747" role="paragraph">The signing of contents got changed with OpenOffice.org 3.2 and StarOffice 9.2. Now all contents of the files, except the signature file itself (META-INF/documentsignatures.xml) are signed. </paragraph>
- <paragraph xml-lang="en-US" id="par_id0821200910191774" role="paragraph">When you sign a document with OpenOffice.org 3.2 or StarOffice 9.2 or a later version, and you open that document in an older version of the software, the signature will be displayed as "invalid". Signatures created with older versions of the software will be marked with "only parts of the document are signed" when loaded in the newer software.</paragraph>
- <paragraph xml-lang="en-US" id="par_id0821200910191775" role="paragraph">When you sign an OOXML document, then the signature will be always marked with "only parts of the document are signed". Metadata of OOXML files are never signed, to be compatible with Microsoft Office.</paragraph>
- <paragraph xml-lang="en-US" id="par_id0821200910191776" role="paragraph">When you sign a PDF document, then this marking is not used. Signing only parts of the document is simply an invalid signature.</paragraph>
- <paragraph xml-lang="en-US" id="par_id0821200910191777" role="paragraph">Signing other document formats is not supported at the moment.</paragraph>
+ <paragraph id="par_id0821200910191747" role="paragraph">The signing of contents got changed with OpenOffice.org 3.2 and StarOffice 9.2. Now all contents of the files, except the signature file itself (META-INF/documentsignatures.xml) are signed. </paragraph>
+ <paragraph id="par_id0821200910191774" role="paragraph">When you sign a document with OpenOffice.org 3.2 or StarOffice 9.2 or a later version, and you open that document in an older version of the software, the signature will be displayed as "invalid". Signatures created with older versions of the software will be marked with "only parts of the document are signed" when loaded in the newer software.</paragraph>
+ <paragraph id="par_id0821200910191775" role="paragraph">When you sign an OOXML document, then the signature will be always marked with "only parts of the document are signed". Metadata of OOXML files are never signed, to be compatible with Microsoft Office.</paragraph>
+ <paragraph id="par_id0821200910191776" role="paragraph">When you sign a PDF document, then this marking is not used. Signing only parts of the document is simply an invalid signature.</paragraph>
+ <paragraph id="par_id0821200910191777" role="paragraph">Signing other document formats is not supported at the moment.</paragraph>
<note id="par_id2008200911583098">When you load an ODF document, you might see an icon in the status bar and the status field in the dialog that indicates that the document is only partially signed. This status will appear when the signature and certificate are valid, but they were created with a version of OpenOffice.org before 3.2 or StarOffice before 9.2. In versions of OpenOffice.org before 3.0 or StarOffice before 9.0, the document signature was applied to the main contents, pictures and embedded objects only and some contents, like macros, were not signed. In OpenOffice.org 3.0 and StarOffice 9.0 the document signature was applied to most content, including macros. However, the mimetype and the content of the META-INF folder were not signed. And in OpenOffice.org 3.2, StarOffice 9.2, and all versions of LibreOffice all contents, except the signature file itself (META-INF/documentsignatures.xml), are signed.</note>
<h2 id="hd_id9354228">Security Warnings</h2>
- <paragraph xml-lang="en-US" id="par_id2372508" role="paragraph">When you receive a signed document, and the software reports that the signature is valid, this does not mean that you can be absolutely sure that the document is the same that the sender has sent. Signing documents with software certificates is not a perfectly secure method. Numerous ways are possible to circumvent the security features.</paragraph>
- <paragraph xml-lang="en-US" id="par_id7953123" role="paragraph">Example: Think about someone who wants to camouflage his identity to be a sender from your bank. He can easily get a certificate using a false name, then send you any signed email pretending he is working for your bank. You will get that email, and the email or the document within has the "valid signed" icon. </paragraph>
- <paragraph xml-lang="en-US" id="par_id6195257" role="paragraph">Do not trust the icon. Inspect and verify the certificates.</paragraph>
+ <paragraph id="par_id2372508" role="paragraph">When you receive a signed document, and the software reports that the signature is valid, this does not mean that you can be absolutely sure that the document is the same that the sender has sent. Signing documents with software certificates is not a perfectly secure method. Numerous ways are possible to circumvent the security features.</paragraph>
+ <paragraph id="par_id7953123" role="paragraph">Example: Think about someone who wants to camouflage his identity to be a sender from your bank. He can easily get a certificate using a false name, then send you any signed email pretending he is working for your bank. You will get that email, and the email or the document within has the "valid signed" icon. </paragraph>
+ <paragraph id="par_id6195257" role="paragraph">Do not trust the icon. Inspect and verify the certificates.</paragraph>
<warning id="par_id8635517">The validation of a signature is not a legally binding guarantee of any kind.</warning>
- <paragraph xml-lang="en-US" id="par_id6075624" role="paragraph">On Windows operating systems, the Windows features of validating a signature are used. On Solaris and Linux systems, files that are supplied by Thunderbird, Mozilla or Firefox are used. You must ensure that the files that are in use within your system are really the original files that were supplied by the original developers. For malevolent intruders, there are numerous ways to replace original files with other files that they supply.</paragraph>
+ <paragraph id="par_id6075624" role="paragraph">On Windows operating systems, the Windows features of validating a signature are used. On Solaris and Linux systems, files that are supplied by Thunderbird, Mozilla or Firefox are used. You must ensure that the files that are in use within your system are really the original files that were supplied by the original developers. For malevolent intruders, there are numerous ways to replace original files with other files that they supply.</paragraph>
<warning id="par_id6819971">The messages about validation of a signature that you see in %PRODUCTNAME are the messages that the validation files return. The %PRODUCTNAME software has no way to ensure that the messages reflect the true status of any certificate. The %PRODUCTNAME software only displays the messages that other files that are not under control of %PRODUCTNAME report. There is no legal responsibility of %PRODUCTNAME that the displayed messages reflect the true status of a digital signature.</warning>
<section id="relatedtopics">
<paragraph role="paragraph" id="par_id681543699425744" localize="false"><embedvar href="text/shared/guide/openpgp.xhp#openpgph1" markup="ignore"/></paragraph>
- <paragraph xml-lang="en-US" id="par_id3204443" role="paragraph"><link href="https://wiki.documentfoundation.org/How_to_use_digital_Signatures">English Wiki page on digital signatures</link></paragraph>
+ <paragraph id="par_id3204443" role="paragraph"><link href="https://wiki.documentfoundation.org/How_to_use_digital_Signatures">English Wiki page on digital signatures</link></paragraph>
<paragraph role="paragraph" id="par_id221638101291847" localize="false"><embedvar href="text/shared/guide/digitalsign_send.xhp#digitalsign_send" markup="ignore"/></paragraph>
- <paragraph xml-lang="en-US" id="par_id3448591" role="paragraph"><link href="text/shared/guide/digitalsign_receive.xhp">Opening a document using WebDAV over HTTPS</link></paragraph>
+ <paragraph id="par_id3448591" role="paragraph"><link href="text/shared/guide/digitalsign_receive.xhp">Opening a document using WebDAV over HTTPS</link></paragraph>
</section>
</body>
</helpdocument>
diff --git a/source/text/shared/guide/dragdrop.xhp b/source/text/shared/guide/dragdrop.xhp
index a50b01ba75..401323b6f7 100644
--- a/source/text/shared/guide/dragdrop.xhp
+++ b/source/text/shared/guide/dragdrop.xhp
@@ -88,7 +88,7 @@
<section id="relatedtopics">
<embed href="text/shared/guide/dragdrop_graphic.xhp#dragdrop_graphic"/>
<embed href="text/shared/guide/dragdrop_table.xhp#dragdrop_table"/>
-<embed href="text/shared/guide/dragdrop_fromgallery.xhp#dragdrop_fromgallery"/>
+<embed href="text/shared/guide/gallery_insert.xhp#gallery_insert"/>
<embed href="text/shared/guide/dragdrop_gallery.xhp#dragdrop_gallery"/>
<switch select="appl">
<case select="WRITER"><embed href="text/swriter/guide/dragdroptext.xhp#dragdroptext"/>
diff --git a/source/text/shared/guide/dragdrop_beamer.xhp b/source/text/shared/guide/dragdrop_beamer.xhp
index 6f5de7b5b1..4194a6e548 100644
--- a/source/text/shared/guide/dragdrop_beamer.xhp
+++ b/source/text/shared/guide/dragdrop_beamer.xhp
@@ -63,7 +63,7 @@
<embed href="text/shared/guide/dragdrop.xhp#dragdrop"/>
<embed href="text/shared/guide/dragdrop_graphic.xhp#dragdrop_graphic"/>
<embed href="text/shared/guide/dragdrop_table.xhp#dragdrop_table"/>
-<embed href="text/shared/guide/dragdrop_fromgallery.xhp#dragdrop_fromgallery"/>
+<embed href="text/shared/guide/gallery_insert.xhp#gallery_insert"/>
<embed href="text/shared/guide/dragdrop_gallery.xhp#dragdrop_gallery"/>
<switch select="appl">
<case select="WRITER"><embed href="text/swriter/guide/dragdroptext.xhp#dragdroptext"/>
diff --git a/source/text/shared/guide/dragdrop_fromgallery.xhp b/source/text/shared/guide/dragdrop_fromgallery.xhp
deleted file mode 100644
index a728af6715..0000000000
--- a/source/text/shared/guide/dragdrop_fromgallery.xhp
+++ /dev/null
@@ -1,65 +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="textsharedguidedragdrop_fromgalleryxml" indexer="include" status="PUBLISH">
-<title id="tit">Copying Graphics From the Gallery</title>
-<filename>/text/shared/guide/dragdrop_fromgallery.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-</history>
-</meta>
-<body>
-<section id="dndfromgallery01">
-<bookmark branch="index" id="bm_id3145345"><bookmark_value>Gallery;dragging pictures to draw objects</bookmark_value>
-<bookmark_value>draw objects;dropping Gallery pictures</bookmark_value>
-<bookmark_value>drag and drop;from Gallery to draw objects</bookmark_value>
-</bookmark><comment>mw deleted "Gallery;copying..." and copied "copying;..." to Shared guide gallery_insert.xhp.</comment>
-<h1 id="hd_id3145345"><variable id="dragdrop_fromgallery"><link href="text/shared/guide/dragdrop_fromgallery.xhp">Copying Graphics From the Gallery</link>
-</variable></h1>
-<paragraph role="paragraph" id="par_id3155535">If you drag a graphic from the Gallery into a text, spreadsheet or presentation document, the graphic will be inserted there.</paragraph>
-</section>
-<section id="dndfromgallery02">
-<paragraph role="paragraph" id="par_id3149762">If you release the graphic <emph>directly on a draw object</emph>, please note the following:</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3153825">If you move the graphic (drag it without pressing any key, in which case no additional symbol appears next to the mouse pointer), only the attributes are copied from the graphic and applied to the draw object on which you release the mouse button.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153665">If you copy the graphic (drag it while holding down the <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline> key, in which case a plus sign appears next to the mouse pointer), the graphic will be inserted as an object.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154514">If you create a hyperlink (drag while holding down Shift and <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>, in which case a linking arrow appears next to the mouse pointer), the drawing object is replaced by the graphic from the Gallery, but the position and size of the replaced draw object are retained.</paragraph>
-</listitem>
-</list>
-</section>
-<section id="relatedtopics">
-<embed href="text/shared/guide/gallery_insert.xhp#gallery_insert"/>
-<embed href="text/shared/guide/dragdrop.xhp#dragdrop"/>
-<embed href="text/shared/guide/dragdrop_graphic.xhp#dragdrop_graphic"/>
-<embed href="text/shared/guide/dragdrop_table.xhp#dragdrop_table"/>
-<embed href="text/shared/guide/dragdrop_gallery.xhp#dragdrop_gallery"/>
-<switch select="appl">
-<case select="WRITER"><embed href="text/swriter/guide/dragdroptext.xhp#dragdroptext"/>
-</case>
-</switch>
-</section>
-</body>
-</helpdocument>
diff --git a/source/text/shared/guide/dragdrop_gallery.xhp b/source/text/shared/guide/dragdrop_gallery.xhp
index 1e16725a98..c4316576af 100644
--- a/source/text/shared/guide/dragdrop_gallery.xhp
+++ b/source/text/shared/guide/dragdrop_gallery.xhp
@@ -32,9 +32,12 @@
<bookmark_value>pasting;to Gallery</bookmark_value>
</bookmark>
<comment>mw changed "adding;" to "inserting;"</comment>
- <h1 id="hd_id3154927"><variable id="dragdrop_gallery"><link href="text/shared/guide/dragdrop_gallery.xhp">Adding Graphics to the Gallery</link>
+ <section id="dragdrop_gallery_head"><h1 id="hd_id3154927"><variable id="dragdrop_gallery"><link href="text/shared/guide/dragdrop_gallery.xhp">Adding Graphics to the Gallery</link>
</variable></h1>
<paragraph id="par_id3143267" role="paragraph">You can place a graphic from a document such as an HTML page in the Gallery by drag-and-drop.</paragraph>
+
+</section>
+
<list type="ordered">
<listitem>
<paragraph id="par_id3154823" role="listitem">Display the Gallery theme to which you want to add the graphic.</paragraph>
@@ -58,7 +61,6 @@
<embed href="text/shared/guide/dragdrop.xhp#dragdrop"/>
<embed href="text/shared/guide/dragdrop_graphic.xhp#dragdrop_graphic"/>
<embed href="text/shared/guide/dragdrop_table.xhp#dragdrop_table"/>
- <embed href="text/shared/guide/dragdrop_fromgallery.xhp#dragdrop_fromgallery"/>
<switch select="appl">
<case select="WRITER">
<embed href="text/swriter/guide/dragdroptext.xhp#dragdroptext"/>
diff --git a/source/text/shared/guide/dragdrop_graphic.xhp b/source/text/shared/guide/dragdrop_graphic.xhp
index 0485b00563..26321f1774 100644
--- a/source/text/shared/guide/dragdrop_graphic.xhp
+++ b/source/text/shared/guide/dragdrop_graphic.xhp
@@ -62,7 +62,7 @@
<section id="relatedtopics">
<embed href="text/shared/guide/dragdrop.xhp#dragdrop"/>
<embed href="text/shared/guide/dragdrop_table.xhp#dragdrop_table"/>
-<embed href="text/shared/guide/dragdrop_fromgallery.xhp#dragdrop_fromgallery"/>
+<embed href="text/shared/guide/gallery_insert.xhp#gallery_insert"/>
<embed href="text/shared/guide/dragdrop_gallery.xhp#dragdrop_gallery"/>
<switch select="appl">
<case select="WRITER"><embed href="text/swriter/guide/dragdroptext.xhp#dragdroptext"/>
diff --git a/source/text/shared/guide/dragdrop_table.xhp b/source/text/shared/guide/dragdrop_table.xhp
index 6bae7ec183..a6bfa771a5 100644
--- a/source/text/shared/guide/dragdrop_table.xhp
+++ b/source/text/shared/guide/dragdrop_table.xhp
@@ -62,7 +62,7 @@
<section id="relatedtopics">
<embed href="text/shared/guide/dragdrop.xhp#dragdrop"/>
<embed href="text/shared/guide/dragdrop_graphic.xhp#dragdrop_graphic"/>
-<embed href="text/shared/guide/dragdrop_fromgallery.xhp#dragdrop_fromgallery"/>
+<embed href="text/shared/guide/gallery_insert.xhp#gallery_insert"/>
<embed href="text/shared/guide/dragdrop_gallery.xhp#dragdrop_gallery"/>
<switch select="appl">
<case select="WRITER"><embed href="text/swriter/guide/dragdroptext.xhp#dragdroptext"/></case>
diff --git a/source/text/shared/guide/gallery_insert.xhp b/source/text/shared/guide/gallery_insert.xhp
index c800ff267d..cb64a55550 100644
--- a/source/text/shared/guide/gallery_insert.xhp
+++ b/source/text/shared/guide/gallery_insert.xhp
@@ -1,7 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
<!--
* This file is part of the LibreOffice project.
*
@@ -19,97 +16,115 @@
* 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">
+<helpdocument version="1.0">
<meta>
<topic id="textsharedguidegallery_insertxml" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">Inserting Objects From the Gallery</title>
+<title id="tit">Inserting Objects From the Gallery</title>
<filename>/text/shared/guide/gallery_insert.xhp</filename>
</topic>
</meta>
<body>
-
-
-<bookmark xml-lang="en-US" branch="index" id="bm_id3145136"><bookmark_value>Gallery; inserting pictures from</bookmark_value>
-<bookmark_value>pictures; inserting from Gallery</bookmark_value>
-<bookmark_value>objects; inserting from Gallery</bookmark_value>
-<bookmark_value>patterns for objects</bookmark_value>
-<bookmark_value>textures;inserting from Gallery</bookmark_value>
-<bookmark_value>backgrounds;inserting from Gallery</bookmark_value>
-<bookmark_value>inserting;objects from Gallery</bookmark_value>
-<bookmark_value>copying;from Gallery</bookmark_value>
+<bookmark branch="index" id="bm_id3145136">
+ <bookmark_value>Gallery; inserting pictures from</bookmark_value>
+ <bookmark_value>pictures; inserting from Gallery</bookmark_value>
+ <bookmark_value>inserting; from Gallery into text</bookmark_value>
+ <bookmark_value>objects; inserting from Gallery</bookmark_value>
+ <bookmark_value>textures;inserting from Gallery</bookmark_value>
+ <bookmark_value>backgrounds;inserting from Gallery</bookmark_value>
+ <bookmark_value>inserting;objects from Gallery</bookmark_value>
+ <bookmark_value>copying;from Gallery</bookmark_value>
+ <bookmark_value>replacing;objects from Gallery</bookmark_value>
+ <bookmark_value>Gallery;dragging pictures to draw objects</bookmark_value>
+ <bookmark_value>draw objects;dropping Gallery pictures</bookmark_value>
+ <bookmark_value>drag and drop;from Gallery to draw objects</bookmark_value>
</bookmark>
<comment>mw deleted "adding;"</comment>
- <paragraph xml-lang="en-US" id="hd_id3145136" role="heading" level="1"><variable id="gallery_insert"><link href="text/shared/guide/gallery_insert.xhp">Inserting Objects From the Gallery</link>
-</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3145345" role="paragraph">You can insert an object in a document either as a <emph>copy</emph> or as a <emph>link</emph>. A copy of an object is independent of the original object. Changes to the original object have no effect on the copy. A link remains dependent on the original object. Changes to the original object are also reflected in the link.</paragraph>
- <h2 id="hd_id3145313">Inserting an object as a copy</h2>
+<section id="gallery_insert_head">
+ <h1 id="hd_id3145136">
+ <variable id="gallery_insert"><link href="text/shared/guide/gallery_insert.xhp">Inserting Objects From the Gallery</link></variable>
+ </h1>
+ <paragraph id="par_id3145345" role="paragraph">You can insert an object from the <link href="text/shared/01/gallery.xhp)"><menuitem>Gallery</menuitem></link> into a text, spreadsheet, drawing or presentation document by dragging and dropping or using the Context Menu. Inserting an object creates a copy of the object so any changes to the object in your document will not affect the object in the Gallery.</paragraph>
+</section>
+ <bookmark branch="hid/svx/ui/gallerymenu2/add" id="bm_id841711560216791" localize="false"/>
+ <h2 id="hd_id3145313">Inserting an object into a document</h2>
<list type="ordered">
<listitem>
- <paragraph xml-lang="en-US" id="par_id3145382" role="listitem">Open the Gallery by clicking the <emph>Gallery</emph> icon on the <emph>Standard</emph> bar, or by selecting <emph>Tools - Gallery</emph>.</paragraph>
+ <paragraph id="par_id3145382" role="listitem">Open the <menuitem>Gallery</menuitem>.</paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_id3154306" role="listitem">Select a theme.</paragraph>
+ <paragraph id="par_id3154306" role="listitem">Select a theme.</paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_id3154516" role="listitem">Select an object using a single click.</paragraph>
+ <paragraph id="par_id3154516" role="listitem">Select an object using a single click.</paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_id3153561" role="listitem">Drag the object into the document, or right-click to open the context menu and select <emph>Insert</emph> and <emph>Copy</emph>.</paragraph>
+ <paragraph id="par_id3153561" role="listitem">Drag the object into the document, or right-click to open the context menu and select <emph>Insert</emph>.</paragraph>
</listitem>
</list>
- <h2 id="hd_id3153061">Inserting an object as a link</h2>
+ <h2 id="hd_id561711644566506">Replacing an object in a document</h2>
+ <h3 id="hd_id511711975545500">By dragging and dropping</h3>
<list type="ordered">
<listitem>
- <paragraph xml-lang="en-US" id="par_id3145068" role="listitem">Open the Gallery by clicking the <emph>Gallery</emph> icon on the <emph>Standard</emph> bar, or by choosing <emph>Insert - Media - Gallery</emph>.</paragraph>
+ <paragraph id="par_id741711644406741" role="listitem">Open the <menuitem>Gallery</menuitem>.</paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_id3148663" role="listitem">Select a theme.</paragraph>
+ <paragraph role="paragraph" id="par_id111711644455162">Select a theme.</paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_id3150543" role="listitem">Select an object by a single click.</paragraph>
- </listitem>
+ <paragraph role="paragraph" id="par_id831711644480884">Select an object using a single click.</paragraph>
+ </listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_id3154140" role="listitem">Drag the object into the document while pressing the Shift and <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline> keys, or right-click to open the context menu and select <emph>Insert</emph> and <emph>Link</emph>.</paragraph>
- </listitem>
+ <paragraph role="paragraph" id="par_id991711644510397">Drag the object over the one you want to replace while holding down the <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline> key.</paragraph>
+ </listitem>
</list>
- <h2 id="hd_id3156282">Inserting an object as a background graphic</h2>
+ <h3 id="hd_id711711975589781">Using the context menu</h3>
<list type="ordered">
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3152920" role="listitem">Open the Gallery by clicking the <emph>Gallery</emph> icon on the <emph>Standard</emph> bar, or by selecting <emph>Tools - Gallery</emph>.</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3151041" role="listitem">Select a theme.</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3145607" role="listitem">Select an object by a single click.</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3147289" role="listitem">Open the context menu and choose <emph>Insert - Background - Page</emph> or <emph>Paragraph</emph>.</paragraph>
- </listitem>
- </list>
- <h2 id="hd_id3145787">Inserting an object as a texture (pattern) for another object</h2>
+ <listitem>
+ <paragraph id="par_id121711975624165" role="listitem">Open the <menuitem>Gallery</menuitem></paragraph>
+ </listitem>
+ <listitem>
+ <paragraph id="par_id771711975652268" role="listitem">Select a theme.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph id="par_id101711975737933" role="listitem">Left-click on the object you want to replace.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph id="par_id381711975764271" role="listitem">Right-click on the object you want to replace it with and select <menuitem>Insert</menuitem>.</paragraph>
+ </listitem>
+</list>
+
+<switch select="appl">
+<case select="WRITER">
+ <h2 id="hd_id3156282">Inserting an object as a background graphic</h2>
<list type="ordered">
<listitem>
- <paragraph xml-lang="en-US" id="par_id3159196" role="listitem">Open the Gallery by clicking the <emph>Gallery</emph> icon on the <emph>Standard</emph> bar, or by selecting <emph>Tools - Gallery</emph>.</paragraph>
+ <paragraph id="par_id3152920" role="listitem">Open the <menuitem>Gallery</menuitem>.</paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_id3152596" role="listitem">Select a theme.</paragraph>
+ <paragraph id="par_id3151041" role="listitem">Select a theme.</paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_id3148617" role="listitem">Select an object by a single click.</paragraph>
+ <paragraph id="par_id3145607" role="listitem">Select an object by a single click.</paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_id3147443" role="listitem">Drag the object on to the other object in the document while pressing <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>.</paragraph>
+ <paragraph id="par_id3147289" role="listitem">Open the context menu and choose <emph>Insert - Background - Page</emph> or <emph>Insert - Background - Paragraph</emph>.</paragraph>
</listitem>
</list>
- <section id="relatedtopics">
-
- <embed href="text/shared/guide/dragdrop_fromgallery.xhp#dragdrop_fromgallery"/>
- <embed href="text/shared/guide/dragdrop_gallery.xhp#dragdrop_gallery"/>
-
+ <note id="par_id171711643080652">The option to insert an object as a background image is only available in %PRODUCTNAME Writer.</note>
+</case>
+ </switch>
+<section id="relatedtopics">
+ <embed href="text/shared/01/gallery.xhp#media_gallery_h1"/>
+ <embed href="text/shared/guide/dragdrop_gallery.xhp#dragdrop_gallery"/>
+ <embed href="text/shared/guide/dragdrop.xhp#dragdrop"/>
+ <embed href="text/shared/guide/dragdrop_graphic.xhp#dragdrop_graphic"/>
+ <embed href="text/shared/guide/dragdrop_table.xhp#dragdrop_table"/>
+ <switch select="appl">
+ <case select="WRITER">
+ <embed href="text/swriter/guide/dragdroptext.xhp#dragdroptext"/>
+ </case>
+ </switch>
</section>
</body>
</helpdocument>
diff --git a/source/text/shared/guide/insert_bitmap.xhp b/source/text/shared/guide/insert_bitmap.xhp
index a94af37f34..64c425ed0e 100644
--- a/source/text/shared/guide/insert_bitmap.xhp
+++ b/source/text/shared/guide/insert_bitmap.xhp
@@ -124,7 +124,7 @@
<switch select="appl">
<case select="WRITER">
<embed href="text/swriter/guide/insert_graphic_dialog.xhp#insert_graphic_dialog"/>
-<embed href="text/swriter/guide/insert_graphic_gallery.xhp#insert_graphic_gallery"/>
+<embed href="text/shared/guide/gallery_insert.xhp#gallery_insert"/>
<embed href="text/swriter/guide/insert_graphic_scan.xhp#insert_graphic_scan"/>
<embed href="text/swriter/guide/insert_graphic_fromdraw.xhp#insert_graphic_fromdraw"/>
<embed href="text/swriter/guide/insert_graphic_fromchart.xhp#insert_graphic_fromchart"/>
diff --git a/source/text/shared/guide/insert_graphic_drawit.xhp b/source/text/shared/guide/insert_graphic_drawit.xhp
index 661ce24077..50dd94b2fd 100644
--- a/source/text/shared/guide/insert_graphic_drawit.xhp
+++ b/source/text/shared/guide/insert_graphic_drawit.xhp
@@ -84,7 +84,7 @@
<case select="WRITER">
<embed href="text/swriter/guide/insert_graphic.xhp#insert_graphic"/>
<embed href="text/swriter/guide/insert_graphic_dialog.xhp#insert_graphic_dialog"/>
- <embed href="text/swriter/guide/insert_graphic_gallery.xhp#insert_graphic_gallery"/>
+ <embed href="text/shared/guide/gallery_insert.xhp#gallery_insert"/>
<embed href="text/swriter/guide/insert_graphic_scan.xhp#insert_graphic_scan"/>
<embed href="text/swriter/guide/insert_graphic_fromdraw.xhp#insert_graphic_fromdraw"/>
<embed href="text/swriter/guide/insert_graphic_fromchart.xhp#insert_graphic_fromchart"/>
diff --git a/source/text/shared/guide/main.xhp b/source/text/shared/guide/main.xhp
index e74fda9a6f..f3d914b47b 100644
--- a/source/text/shared/guide/main.xhp
+++ b/source/text/shared/guide/main.xhp
@@ -103,7 +103,6 @@
<embed href="text/shared/guide/dragdrop.xhp#dragdrop"/>
<embed href="text/shared/guide/dragdrop_beamer.xhp#dragdrop_beamer"/>
<embed href="text/shared/guide/gallery_insert.xhp#gallery_insert"/>
-<embed href="text/shared/guide/dragdrop_fromgallery.xhp#dragdrop_fromgallery"/>
<embed href="text/shared/guide/dragdrop_gallery.xhp#dragdrop_gallery"/>
<embed href="text/shared/guide/dragdrop_graphic.xhp#dragdrop_graphic"/>
<embed href="text/shared/guide/copy_drawfunctions.xhp#copy_drawfunctions"/>
diff --git a/source/text/shared/menu/style_menu.xhp b/source/text/shared/menu/style_menu.xhp
index 4367bc3da0..4ff68262b5 100644
--- a/source/text/shared/menu/style_menu.xhp
+++ b/source/text/shared/menu/style_menu.xhp
@@ -68,11 +68,24 @@
<case select="CALC">
<paragraph id="par_id951701984989443" role="paragraph"><ahelp hid=".">Contains commands to apply, create, edit, update, load, and manage styles in a spreadsheet document.</ahelp></paragraph>
</case>
+ <case select="IMPRESS">
+ <paragraph role="paragraph" id="par_id191713460859953">Contains commands to create, edit, update, and manage styles in a presentation document.</paragraph>
+ </case>
</switch>
</section>
<section id="howtoget">
<embed href="text/shared/00/00000004.xhp#from_menu_bar"/>
- <paragraph role="paragraph" id="par_id71693522443488">Choose <menuitem>Styles</menuitem>.</paragraph>
+ <switch select="appl">
+ <case select="IMPRESS">
+ <paragraph role="paragraph" id="par_id991713461213944">Choose <menuitem>Format - Styles</menuitem>.</paragraph>
+ </case>
+ <case select="DRAW">
+ <paragraph role="paragraph" id="par_id811713461480734">Choose <menuitem>Format - Styles</menuitem>.</paragraph>
+ </case>
+ <default>
+ <paragraph role="paragraph" id="par_id71693522443488">Choose <menuitem>Styles</menuitem>.</paragraph>
+ </default>
+ </switch>
</section>
<switch select="appl">
<case select="WRITER">
@@ -83,20 +96,20 @@
<h2 id="par_id811701985858003">Cell styles entries</h2>
<paragraph role="paragraph" id="par_id31701985198261">The entries includes most common cell styles. Click on the style to apply.</paragraph>
</case>
- <case select="IMPRESS">
- </case>
- <case select="DRAW">
- </case>
+ </switch>
+ <switch select="appl">
+ <case select="IMPRESS"></case>
+ <case select="DRAW"></case>
<default>
+ <tip id="par_id451529878529005">You can customize the list of styles entries using menu <link href="text/shared/01/06140100.xhp"><emph>Tools - Customize</emph></link>. Because custom styles belongs to the actual document, remember to store the customized menu in the document scope.</tip>
</default>
</switch>
- <tip id="par_id451529878529005">You can customize the list of styles entries using menu <link href="text/shared/01/06140100.xhp"><emph>Tools - Customize</emph></link>. Because custom styles belongs to the actual document, remember to store the customized menu in the document scope.</tip>
-
<switch select="appl">
- <case select="WRITER">
+ <case select="CALC"></case>
+ <default>
<embed href="text/swriter/01/EditStyle.xhp#editstyle"/>
- </case>
+ </default>
</switch>
<embed href="text/shared/01/StyleUpdateByExample.xhp#styleupdatebyexample"/>
<embed href="text/shared/01/StyleNewByExample.xhp#stylenewbyexample"/>
diff --git a/source/text/shared/optionen/01060500.xhp b/source/text/shared/optionen/01060500.xhp
index 9e3b7724fd..563494411f 100644
--- a/source/text/shared/optionen/01060500.xhp
+++ b/source/text/shared/optionen/01060500.xhp
@@ -148,7 +148,7 @@
<paragraph id="par_id3150644" role="paragraph"><ahelp hid="modules/scalc/ui/optcalculatepage/calc">Specifies whether to make calculations using the rounded values displayed in the sheet. Charts will be shown with the displayed values. If the <emph>Precision as shown</emph> option is not marked, the displayed numbers are rounded, but they are calculated internally using the non-rounded number.</ahelp></paragraph>
<bookmark branch="hid/modules/scalc/ui/optcalculatepage/match" id="bm_id3150364" localize="false"/>
<h2 id="hd_id3152581">Search criteria = and &lt;&gt; must apply to whole cells</h2>
- <paragraph id="par_id3149211" role="paragraph"><ahelp hid="modules/scalc/ui/optcalculatepage/match">Specifies that the search criteria you set for the Calc database functions must match the whole cell exactly. When both, the <emph>Search criteria = and &lt;&gt; must apply to whole cells</emph> box and the <emph>Enable wildcards in formulas</emph> box are marked, $[officename] Calc behaves exactly as Microsoft Excel when searching cells in the database functions.</ahelp></paragraph>
+ <paragraph id="par_id3149211" role="paragraph"><ahelp hid="modules/scalc/ui/optcalculatepage/match">Specifies that the search criteria you set for the Calc database functions must match the whole cell exactly. When both, the <emph>Search criteria = and &lt;&gt; must apply to whole cells</emph> box and the <emph>Enable wildcards in formulas</emph> box are marked, $[officename] Calc behaves exactly as Microsoft Excel when searching cells in the database functions.</ahelp></paragraph>
<table id="tbl_id3149814">
<tablerow>
<tablecell>
@@ -227,9 +227,9 @@
<bookmark branch="hid/modules/scalc/ui/optcalculatepage/lookup" id="bm_id3152901" localize="false"/>
<h2 id="hd_id3156199">Automatically find column and row labels</h2>
- <paragraph id="par_id3153818" role="paragraph"><ahelp hid="modules/scalc/ui/optcalculatepage/lookup">Specifies that you can use the text in any cell as a label for the column below the text or the row to the right of the text. The text must consist of at least one word and must not contain any operators.</ahelp></paragraph>
- <paragraph id="par_id3151242" role="paragraph">
- <emph>Example</emph>: Cell E5 contains the text "Europe". Below, in cell E6, is the value 100 and in cell E7 the value 200. If the <emph>Automatically find column and row labels</emph> box is marked, you can write the following formula in cell A1: =SUM(Europe).</paragraph>
+<paragraph id="par_id3153818" role="paragraph"><ahelp hid="modules/scalc/ui/optcalculatepage/lookup">Specifies that you can use the text in any cell as a label for the column below the text or the row to the right of the text. The text must consist of at least one word and must not contain any operators.</ahelp></paragraph>
+<paragraph id="par_id3151242" role="paragraph"><emph>Example</emph>: Cell E5 contains the text "Europe". Below, in cell E6, is the value 100 and in cell E7 the value 200. If the <emph>Automatically find column and row labels</emph> box is marked, you can write the following formula in cell A1: =SUM(Europe).</paragraph>
+<paragraph role="paragraph" id="par_id101713445258305">For more information, see <link href="text/scalc/guide/address_auto.xhp">Recognizing Names as Addressing</link>.</paragraph>
<bookmark branch="hid/modules/scalc/ui/optcalculatepage/generalprec" id="bm_id315342901" localize="false"/>
<h2 id="hd_id315634199">Limit decimals for general number format</h2>
diff --git a/source/text/shared/optionen/01060900.xhp b/source/text/shared/optionen/01060900.xhp
index ae6ca2244a..56cea987cb 100644
--- a/source/text/shared/optionen/01060900.xhp
+++ b/source/text/shared/optionen/01060900.xhp
@@ -20,13 +20,13 @@
<meta>
<topic id="textsharedoptionen01060900xml" indexer="include" status="PUBLISH">
- <title id="tit" xml-lang="en-US">Formula</title>
+ <title id="tit">Formula</title>
<filename>/text/shared/optionen/01060900.xhp</filename>
</topic>
</meta>
<body>
<section id="formula">
- <bookmark xml-lang="en-US" branch="index" id="bm_id4249399">
+<bookmark branch="index" id="bm_id4249399">
<bookmark_value>formula options;formula syntax</bookmark_value>
<bookmark_value>formula options;separators</bookmark_value>
<bookmark_value>formula options;reference syntax in string parameters</bookmark_value>
@@ -40,67 +40,83 @@
<bookmark_value>recalculating;formula options</bookmark_value>
<bookmark_value>recalculating;large spreadsheet files</bookmark_value>
<bookmark_value>loading;large spreadsheet files</bookmark_value>
+<bookmark_value>loading;optimal row height</bookmark_value>
+<bookmark_value>optimal row height;recalculation</bookmark_value>
</bookmark>
- <bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/optformula/OptFormula" id="bm_id3149095" localize="false"/>
- <bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/optformula/@@nowidget@@" id="@@nowidget@@" localize="false"/>
+ <bookmark branch="hid/modules/scalc/ui/optformula/OptFormula" id="bm_id3149095" localize="false"/>
+ <bookmark branch="hid/modules/scalc/ui/optformula/@@nowidget@@" id="@@nowidget@@" localize="false"/>
<h1 id="hd_id3145071"><link href="text/shared/optionen/01060900.xhp">Formula</link></h1>
- <paragraph id="par_id3147576" role="paragraph" xml-lang="en-US"><ahelp hid=".">Defines formula syntax options and loading options for %PRODUCTNAME Calc.</ahelp></paragraph>
+ <paragraph id="par_id3147576" role="paragraph"><ahelp hid=".">Defines formula syntax options and loading options for %PRODUCTNAME Calc.</ahelp></paragraph>
</section>
<section id="howtoget">
<embed href="text/shared/00/00000406.xhp#exopfo"/>
</section>
<h2 id="hd_id3149399">Formula options</h2>
<h3 id="hd_id31493991">Formula syntax</h3>
- <paragraph id="par_id3155419" role="paragraph" xml-lang="en-US">There are three options. Let's see it by example. In a sample spreadsheet there are two worksheets, Sheet1 and Sheet2. In A1 cell of Sheet1 there is a reference to C4 cell of Sheet2.</paragraph>
+ <paragraph id="par_id3155419" role="paragraph">There are three options. Let's see it by example. In a sample spreadsheet there are two worksheets, Sheet1 and Sheet2. In A1 cell of Sheet1 there is a reference to C4 cell of Sheet2.</paragraph>
<list type="unordered">
<listitem>
- <paragraph id="par_id3156155" role="listitem" xml-lang="en-US"><emph>Calc A1</emph> - This is the default of %PRODUCTNAME Calc. The reference will be <item type="input">=$Sheet2.C4</item></paragraph>
+ <paragraph id="par_id3156155" role="listitem"><emph>Calc A1</emph> - This is the default of %PRODUCTNAME Calc. The reference will be <item type="input">=$Sheet2.C4</item></paragraph>
</listitem>
<listitem>
- <paragraph id="par_id3147530" role="listitem" xml-lang="en-US"><emph>Excel A1</emph> - This is the default of Microsoft Excel. The reference will be <item type="input">=Sheet2!C4</item></paragraph>
+ <paragraph id="par_id3147530" role="listitem"><emph>Excel A1</emph> - This is the default of Microsoft Excel. The reference will be <item type="input">=Sheet2!C4</item></paragraph>
</listitem>
<listitem>
- <paragraph id="par_id3153061" role="listitem" xml-lang="en-US"><emph>Excel R1C1</emph> - This is the relative row/column addressing, known from Microsoft Excel. The reference will be <item type="input">=Sheet2!R[3]C[2]</item></paragraph>
+ <paragraph id="par_id3153061" role="listitem"><emph>Excel R1C1</emph> - This is the relative row/column addressing, known from Microsoft Excel. The reference will be <item type="input">=Sheet2!R[3]C[2]</item></paragraph>
</listitem></list>
<h3 id="hd_id31493992">Use English function names</h3>
- <paragraph id="par_id4155419" role="paragraph" xml-lang="en-US">In %PRODUCTNAME Calc function names can be localized. By default, the check box is off, which means the localized function names are used. Checking this check box will swap localized function names with the English ones. This change takes effect in all of the following areas: formula input and display, function wizard, and formula tips. You can of course uncheck it to go back to the localized function names.</paragraph>
+ <paragraph id="par_id4155419" role="paragraph">In %PRODUCTNAME Calc function names can be localized. By default, the check box is off, which means the localized function names are used. Checking this check box will swap localized function names with the English ones. This change takes effect in all of the following areas: formula input and display, function wizard, and formula tips. You can of course uncheck it to go back to the localized function names.</paragraph>
<h2 id="hd_id4149399">Separators</h2>
- <paragraph id="par_id5155419" role="paragraph" xml-lang="en-US">This option group lets you configure separators in your formula expressions. This comes in handy when, for instance, you want to separate your function parameters by commas (,) instead of semicolons (;).</paragraph>
- <paragraph id="par_id6155419" role="paragraph" xml-lang="en-US">For example, instead of <item type="input">=SUM(A1;B1;C1)</item> you can type <item type="input">=SUM(A1,B1,C1)</item>.</paragraph>
- <paragraph id="par_id7155419" role="paragraph" xml-lang="en-US">Likewise, you can also change the column and row separators for in-line arrays. Previously, an in-line array used semicolons (;) as the column separators and the pipe symbols (|) as the row separators, so a typical in-line array expression looked like this for a 5 x 2 matrix array:</paragraph>
- <paragraph id="par_id8155419" role="paragraph" xml-lang="en-US"><item type="input">={1;2;3;4;5|6;7;8;9;10}</item></paragraph>
- <paragraph id="par_id9155419" role="paragraph" xml-lang="en-US">By changing the column separators to commas (,) and the row separators to semicolons (;), the same expression will look like this:</paragraph>
- <paragraph id="par_id0155419" role="paragraph" xml-lang="en-US"><item type="input">={1,2,3,4,5;6,7,8,9,10}</item></paragraph>
+ <paragraph id="par_id5155419" role="paragraph">This option group lets you configure separators in your formula expressions. This comes in handy when, for instance, you want to separate your function parameters by commas (,) instead of semicolons (;).</paragraph>
+ <paragraph id="par_id6155419" role="paragraph">For example, instead of <item type="input">=SUM(A1;B1;C1)</item> you can type <item type="input">=SUM(A1,B1,C1)</item>.</paragraph>
+ <paragraph id="par_id7155419" role="paragraph">Likewise, you can also change the column and row separators for in-line arrays. Previously, an in-line array used semicolons (;) as the column separators and the pipe symbols (|) as the row separators, so a typical in-line array expression looked like this for a 5 x 2 matrix array:</paragraph>
+ <paragraph id="par_id8155419" role="paragraph"><item type="input">={1;2;3;4;5|6;7;8;9;10}</item></paragraph>
+ <paragraph id="par_id9155419" role="paragraph">By changing the column separators to commas (,) and the row separators to semicolons (;), the same expression will look like this:</paragraph>
+ <paragraph id="par_id0155419" role="paragraph"><item type="input">={1,2,3,4,5;6,7,8,9,10}</item></paragraph>
<embed href="text/shared/optionen/detailedcalculation.xhp#detailed_calculation"/>
<h2 id="hd_id5149400">Recalculation on File Load</h2>
- <paragraph id="par_id2335549" role="paragraph" xml-lang="en-US">Recalculating formulas can take significant time while loading very large files.</paragraph>
-
+ <paragraph id="par_id2335549" role="paragraph">Recalculating formulas can take significant time while loading very large files.</paragraph>
+ <bookmark branch="hid/modules/scalc/ui/optformula/ooxmlrecalc" id="bm_id217525967776" localize="false"/>
<h3 id="par_id2115549">Excel 2007 and newer:</h3>
- <paragraph id="par_id2015549" role="paragraph" xml-lang="en-US">Loading a large spreadsheet file can take a long time. If you don't need to update your large spreadsheet data immediately, you can postpone the recalculation at a better time. %PRODUCTNAME allows you to defer recalculation of Excel 2007 (and above) spreadsheets to speedup loading time. </paragraph>
-
+ <paragraph id="par_id2015549" role="paragraph">Loading a large spreadsheet file can take a long time. If you don't need to update your large spreadsheet data immediately, you can postpone the recalculation at a better time. %PRODUCTNAME allows you to defer recalculation of Excel 2007 (and above) spreadsheets to speedup loading time. </paragraph>
+ <bookmark branch="hid/modules/scalc/ui/optformula/odfrecalc" id="bm_id21752590967776" localize="false"/>
<h3 id="par_id2215549">ODF Spreadsheet (not saved by %PRODUCTNAME):</h3>
- <paragraph id="par_id2016549" role="paragraph" xml-lang="en-US">Recent versions of %PRODUCTNAME caches spreadsheet formula results into its ODF file. This feature helps %PRODUCTNAME to recalculate a large ODF spreadsheet saved by %PRODUCTNAME faster. </paragraph>
- <paragraph id="par_id2017549" role="paragraph" xml-lang="en-US">For ODF spreadsheets saved by other programs, where such cached formula results may not exist, recalculation can be deferred to speedup file loading as with Excel 2007 files. </paragraph>
- <paragraph id="par_id2315549" role="paragraph" xml-lang="en-US">For the entries above the following choices are possible:</paragraph>
+ <paragraph id="par_id2016549" role="paragraph">Recent versions of %PRODUCTNAME caches spreadsheet formula results into its ODF file. This feature helps %PRODUCTNAME to recalculate a large ODF spreadsheet saved by %PRODUCTNAME faster. </paragraph>
+ <paragraph id="par_id2017549" role="paragraph">For ODF spreadsheets saved by other programs, where such cached formula results may not exist, recalculation can be deferred to speedup file loading as with Excel 2007 files. </paragraph>
+ <paragraph id="par_id2315549" role="paragraph">For the entries above the following choices are possible:</paragraph>
<list type="unordered">
<listitem>
- <paragraph id="par_id3256155" role="listitem" xml-lang="en-US"><emph>Never recalculate</emph> - No formulas will be recalculated on loading the file.</paragraph>
+ <paragraph id="par_id3256155" role="listitem"><emph>Never recalculate</emph> - No formulas will be recalculated on loading the file.</paragraph>
</listitem>
<listitem>
- <paragraph id="par_id3247530" role="listitem" xml-lang="en-US"><emph>Always recalculate</emph> - All formulas will be recalculated on file load.</paragraph>
+ <paragraph id="par_id3247530" role="listitem"><emph>Always recalculate</emph> - All formulas will be recalculated on file load.</paragraph>
</listitem>
<listitem>
- <paragraph id="par_id3253061" role="listitem" xml-lang="en-US"><emph>Prompt user</emph> - Prompt user for action.</paragraph>
- </listitem></list>
+ <paragraph id="par_id3253061" role="listitem"><emph>Prompt user</emph> - Prompt user for action.</paragraph>
+ </listitem>
+ </list>
<tip id="par_id2010549">%PRODUCTNAME saved ODF spreadsheets will honor <emph>Never recalculate</emph> and <emph>Always recalculate</emph> options. </tip>
-
+ <bookmark branch="hid/modules/scalc/ui/optformula/rowheightrecalc" id="bm_id21712590967776" localize="false"/>
+ <h3 id="hd_id351712589455802">Optimal Row Height</h3>
+ <paragraph role="paragraph" id="par_id861712590713554">For large spreadsheets documents, optimal row height calculation depends on the cell contents formatting and also on the result of the conditional formatted formulas. This setting helps to shorten load times by controlling the optimal row height calculation.</paragraph>
+ <list type="unordered">
+ <listitem>
+ <paragraph id="par_id301712590444434" role="listitem"><emph>Never recalculate</emph> - No row height will be recalculated on loading the file.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph id="par_id171712590450298" role="listitem"><emph>Always recalculate</emph> - All row height will be recalculated on file load.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph id="par_id91712590453754" role="listitem"><emph>Prompt user</emph> - Prompt user for action.</paragraph>
+ </listitem>
+ </list>
<section id="relatedtopics">
- <paragraph id="par_id200920171902249043" role="paragraph" xml-lang="en-US"><link href="text/scalc/01/04060107.xhp">Array formulas</link></paragraph>
+ <paragraph id="par_id200920171902249043" role="paragraph"><link href="text/scalc/01/04060107.xhp">Array formulas</link></paragraph>
</section>
</body>
</helpdocument>
diff --git a/source/text/shared/optionen/opencl.xhp b/source/text/shared/optionen/opencl.xhp
index aa5f168936..af85de2ecd 100644
--- a/source/text/shared/optionen/opencl.xhp
+++ b/source/text/shared/optionen/opencl.xhp
@@ -20,26 +20,30 @@
<meta>
<topic id="topic_2015201522062086" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit_opencl">OpenCL</title>
+<title id="tit_opencl">OpenCL</title>
<filename>/text/shared/optionen/opencl.xhp</filename>
</topic>
</meta>
<body>
<section id="opencl">
-<bookmark xml-lang="en-US" branch="hid/cui/ui/optopenclpage/OptOpenCLPage" id="bm_id6882839" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/cui/ui/optopenclpage/@@nowidget@@" id="bm_id6882839" localize="false"/>
-<bookmark xml-lang="en-US" branch="index" id="bm_id4077578">
+<bookmark branch="hid/cui/ui/optopenclpage/OptOpenCLPage" id="bm_id6882839" localize="false"/>
+<bookmark branch="hid/cui/ui/optopenclpage/@@nowidget@@" id="bm_id6882839" localize="false"/>
+<bookmark branch="index" id="bm_id4077578">
<bookmark_value>OpenCL;setting options</bookmark_value>
<bookmark_value>setting options;OpenCL</bookmark_value>
</bookmark>
<h1 id="par_idN10558"><link href="text/shared/optionen/opencl.xhp">OpenCL</link></h1>
-<paragraph id="par_idN10568" role="paragraph" xml-lang="en-US">OpenCL is a technology to speed up calculation on large spreadsheets.</paragraph>
+<paragraph id="par_idN10568" role="paragraph">OpenCL is a technology to speed up calculation on large spreadsheets.</paragraph>
</section>
<section id="howtoget"><embed href="text/shared/00/00000406.xhp#opencl"/>
</section>
-<paragraph role="paragraph" id="par_id8266853" xml-lang="en-US">OpenCL™ is the first open, royalty-free standard for cross-platform, parallel programming of modern processors found in personal computers, servers and handheld/embedded devices. OpenCL (Open Computing Language) greatly improves speed and responsiveness for a wide spectrum of applications in numerous market categories from gaming and entertainment to scientific and medical software</paragraph>
-<paragraph role="note" id="par_id5293741" xml-lang="en-US">for more information on OpenCL, visit <link href="https://www.khronos.org/opencl/">the OpenCL site</link></paragraph>
-
-<embed href="text/shared/need_help.xhp#needhelp"/>
+<paragraph role="paragraph" id="par_id8266853">OpenCL™ is the first open, royalty-free standard for cross-platform, parallel programming of modern processors found in personal computers, servers and handheld/embedded devices. OpenCL (Open Computing Language) greatly improves speed and responsiveness for a wide spectrum of applications in numerous market categories from gaming and entertainment to scientific and medical software</paragraph>
+<note id="par_id5293741">for more information on OpenCL, visit <link href="https://www.khronos.org/opencl/">the OpenCL site</link></note>
+<paragraph role="paragraph" id="par_id961713183211118">By default, OpenCL is enabled in %PRODUCTNAME . While enabled, OpenCL takes advantage of a device’s GPU (graphics processing unit) for faster performance time during calculations. This is helpful when working with large spreadsheets in %PRODUCTNAME Calc that require calculations on large sets of data.</paragraph>
+<h2 id="hd_id101713183273963">OpenCL Options</h2>
+<paragraph role="paragraph" id="par_id841713183298490">If OpenCL is already enabled, the dialog displays <emph>OpenCL is available for use</emph>. If OpenCL is not currently enabled, the displays <emph>OpenCL is not used</emph>.</paragraph>
+<h3 id="hd_id291713183290002">Allow Use of OpenCL</h3>
+<paragraph role="paragraph" id="par_id831713183303281">Select or deselect this checkbox to enable or disable OpenCL. Select Apply or OK to update settings. In order for any changes to take effect, %PRODUCTNAME must be restarted.</paragraph>
+<note id="par_id771713183669144">OpenCL depends on the availability of working drivers for your computer hardware. If OpenCL is not enabled by default, the drivers are not in working state, they may not exist or they are not installed.</note>
</body>
</helpdocument>
diff --git a/source/text/simpress/format_submenu_lists.xhp b/source/text/simpress/format_submenu_lists.xhp
deleted file mode 100644
index 78bbdbdf01..0000000000
--- a/source/text/simpress/format_submenu_lists.xhp
+++ /dev/null
@@ -1,31 +0,0 @@
-<?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="formatsubmenulists" indexer="include" status="PUBLISH">
- <title id="tit" xml-lang="en-US">Lists</title>
- <filename>/text/simpress/format_submenu_lists.xhp</filename>
- </topic>
- </meta>
- <body>
- <section id="impressformatsubmenulists">
- <bookmark id="bm_id341649419524036" xml-lang="en-US" branch="hid/zzzz" localize="false"/>
- <h1 id="hd_id501649419524037"><variable id="h1"><link href="text/simpress/format_submenu_lists.xhp">Lists</link></variable></h1>
- <paragraph id="par_id291649419524039" role="paragraph" xml-lang="en-US">For the selected paragraphs, adds numbering or bullets, edit the outline levels and move them up or down in the slide.</paragraph>
- </section>
- <embed href="text/shared/02/06120000.xhp#toggle_bullets"/>
- <embed href="text/swriter/02/02110000.xhp#numberingh1"/>
- <embed href="text/shared/02/06060000.xhp#promote_one_level"/>
- <embed href="text/shared/02/06050000.xhp#demote_one_level"/>
- <embed href="text/shared/02/06110000.xhp#move_down"/>
- <embed href="text/shared/02/06100000.xhp#move_up"/>
-</body>
-</helpdocument>
diff --git a/source/text/simpress/main0203.xhp b/source/text/simpress/main0203.xhp
index 761814b446..8a3ea7d30b 100644
--- a/source/text/simpress/main0203.xhp
+++ b/source/text/simpress/main0203.xhp
@@ -53,9 +53,9 @@
<embed href="text/shared/01/05080400.xhp#block"/>
<embed href="text/shared/00/00040502.xhp#syblocksatz"/>
<embed href="text/shared/02/03110000.xhp#increase_spacing"/>
- <embed href="text/shared/02/03110000.xhp#syincrease_spacing"/>
+ <embed href="text/shared/00/00040502.xhp#syincrease_spacing"/>
<embed href="text/shared/02/03120000.xhp#decrease_spacing"/>
- <embed href="text/shared/02/03120000.xhp#sydecrease_spacing"/>
+ <embed href="text/shared/00/00040502.xhp#sydecrease_spacing"/>
<switch select="appl">
<case select="DRAW">
<embed href="text/shared/01/05120100.xhp#lines1"/>
diff --git a/source/text/simpress/main_format.xhp b/source/text/simpress/main_format.xhp
index 33f38ff966..cfbcb1e3e6 100644
--- a/source/text/simpress/main_format.xhp
+++ b/source/text/simpress/main_format.xhp
@@ -19,37 +19,28 @@
<helpdocument version="1.0">
<meta>
<topic id="textsimpressmain_formatxml" indexer="include" status="PUBLISH">
- <title id="tit" xml-lang="en-US">Format</title>
+ <title id="tit">Format</title>
<filename>/text/simpress/main_format.xhp</filename>
</topic>
</meta>
<body>
<section id="format">
- <bookmark xml-lang="en-US" branch="hid/.uno:FormatMenu" id="bm_id4682149" localize="false"/>
+ <bookmark branch="hid/.uno:FormatMenu" id="bm_id4682149" localize="false"/>
<h1 id="hd_id3152596"><link href="text/simpress/main_format.xhp">Format</link></h1>
- <paragraph id="par_id3145801" role="paragraph" xml-lang="en-US"><ahelp hid=".">Contains commands for formatting the layout and the contents of your document.</ahelp></paragraph>
+ <paragraph id="par_id3145801" role="paragraph"><ahelp hid=".">Contains commands for formatting the layout and the contents of your document.</ahelp></paragraph>
</section>
<embed href="text/shared/menu/submenu_text.xhp#submenu_text"/>
<embed href="text/shared/menu/submenu_spacing.xhp#submenu_spacing"/>
<embed href="text/shared/01/05080000.xhp#alignment"/>
-
- <h2 id="hd_id951602975070826"><link href="text/simpress/format_submenu_lists.xhp">Lists</link></h2>
- <paragraph role="paragraph" id="par_id461602975083850">Opens a submenu where you can modify the formatting of list paragraphs.</paragraph>
-
+ <embed href="text/shared/menu/submenu_lists.xhp#submenu_lists"/>
<embed href="text/shared/01/05010000.xhp#standard"/>
- <h2 id="hd_id451615217475502">Styles</h2>
- <paragraph role="paragraph" id="par_id41615217505414">Shows commands to edit, update, create, and manage styles.</paragraph><comment>Needs a submenu page</comment>
-
- <h2 id="hd_id3147401"><link href="text/shared/01/05020000.xhp">Character</link></h2>
- <embed href="text/shared/01/05020000.xhp#zeichentext"/>
-
- <h2 id="hd_id3149941"><link href="text/shared/01/05030000.xhp">Paragraph</link></h2>
- <embed href="text/shared/01/05030000.xhp#absatztext"/>
-
- <h2 id="hd_id3147299"><link href="text/shared/01/06050000.xhp">Bullets and Numbering</link></h2>
- <embed href="text/shared/01/06050000.xhp#numauftext"/>
+ <embed href="text/shared/menu/style_menu.xhp#styles"/>
+ <embed href="text/shared/01/05020000.xhp#character"/>
+ <embed href="text/shared/01/05030000.xhp#paragraph"/>
+ <embed href="text/shared/01/06050000.xhp#bullets_and_numbering"/>
+ <embed href="text/swriter/main0110.xhp#table"/>
<h2 id="hd_id801615217485302">Table</h2>
<paragraph role="paragraph" id="par_id61615217563797">Shows commands to format, edit, and delete a table and its elements.</paragraph><comment>Needs a submenu page</comment>
diff --git a/source/text/swriter/00/00000405.xhp b/source/text/swriter/00/00000405.xhp
index ee90827495..614ba11745 100644
--- a/source/text/swriter/00/00000405.xhp
+++ b/source/text/swriter/00/00000405.xhp
@@ -519,7 +519,15 @@
</section>
<section id="select_table">
<embed href="text/shared/00/00000004.xhp#from_menu_bar"/>
- <paragraph id="par_id91693738574824" role="paragraph">Choose <emph>Table - Select - Table</emph>.</paragraph>
+ <switch select="appl">
+ <case select="WRITER">
+ <paragraph id="par_id91693738574824" role="paragraph">Choose <emph>Table - Select - Table</emph>.</paragraph>
+ </case>
+ <case select="CALC"></case>
+ <default>
+ <paragraph role="paragraph" id="par_id401713819764756">Choose <menuitem>Format - Table - Select</menuitem>.</paragraph>
+ </default>
+ </switch>
<embed href="text/shared/00/00000004.xhp#from_tabUI"/>
<paragraph role="paragraph" id="par_id391693741329079">Choose <menuitem>Table - Select Table</menuitem>.</paragraph>
<embed href="text/shared/00/00000004.xhp#from_toolbars"/>
@@ -535,8 +543,12 @@
</tablerow>
</table>
</section>
- <embed href="text/shared/00/00000004.xhp#from_sidebar"/>
- <paragraph role="paragraph" id="par_id381693738669400">Choose <menuitem>Properties - Table - Table</menuitem>.</paragraph>
+ <switch select="appl">
+ <case select="WRITER">
+ <embed href="text/shared/00/00000004.xhp#from_sidebar"/>
+ <paragraph role="paragraph" id="par_id381693738669400">Choose <menuitem>Properties - Table - Table</menuitem>.</paragraph>
+ </case>
+ </switch>
</section>
<section id="object_properties">
@@ -572,7 +584,15 @@
<section id="delete_table">
<embed href="text/shared/00/00000004.xhp#from_menu_bar"/>
- <paragraph role="paragraph" id="par_id131693690148929">Choose <menuitem>Table - Delete - Table</menuitem>.</paragraph>
+ <switch select="appl">
+ <case select="WRITER">
+ <paragraph role="paragraph" id="par_id131693690148929">Choose <menuitem>Table - Delete - Table</menuitem>.</paragraph>
+ </case>
+ <case select="CALC"></case>
+ <default>
+ <paragraph role="paragraph" id="par_id401713820421114">Choose <menuitem>Format - Table - Delete Table</menuitem>.</paragraph>
+ </default>
+ </switch>
<embed href="text/shared/00/00000004.xhp#from_context"/>
<paragraph role="paragraph" id="par_id531693690152814">Choose <menuitem>Delete - Table</menuitem>.</paragraph>
<embed href="text/shared/00/00000004.xhp#from_toolbars"/>
@@ -586,9 +606,14 @@
</tablecell>
</tablerow>
</table>
- <embed href="text/shared/00/00000004.xhp#from_sidebar"/>
- <paragraph role="paragraph" id="par_id691693690135938">Choose <menuitem>Properties - Table - Delete Table</menuitem>.</paragraph>
+ <switch select="appl">
+ <case select="WRITER">
+ <embed href="text/shared/00/00000004.xhp#from_sidebar"/>
+ <paragraph role="paragraph" id="par_id691693690135938">Choose <menuitem>Properties - Table - Delete Table</menuitem>.</paragraph>
+ </case>
+ </switch>
</section>
+
<section id="delete_table_menu">
<embed href="text/shared/00/00000004.xhp#from_menu_bar"/>
<paragraph role="paragraph" id="par_id61693691400020">Choose <menuitem>Table - Delete</menuitem>.</paragraph>
diff --git a/source/text/swriter/01/02110000.xhp b/source/text/swriter/01/02110000.xhp
index 803bd84d4f..0f24de8c07 100644
--- a/source/text/swriter/01/02110000.xhp
+++ b/source/text/swriter/01/02110000.xhp
@@ -48,7 +48,7 @@
<paragraph id="par_id3149490" role="paragraph">Click the expander icon (+) next to a category in the Navigator to view the items in the category. Click on an expanded category to collapse it.</paragraph>
<paragraph role="paragraph" id="par_id611683893638800">To view the number of items in a category, rest your mouse pointer over the category in the Navigator.</paragraph>
<paragraph role="paragraph" id="par_id941683893643631">To jump to an item in the document, double-click the item in the Navigator.</paragraph>
-<paragraph id="par_id3149106" role="paragraph">To jump to the next or previous item in a document, use the <emph>Navigate by</emph> box to select the item category, and then click the up or down arrows.</paragraph>
+<paragraph id="par_id3149106" role="paragraph">To jump to the next or previous item in a document, use the <link href="text/swriter/01/02110100.xhp"><emph>Navigate By</emph></link> list to select the item category, and then click the <emph>Previous</emph> or <emph>Next</emph> arrows.</paragraph>
<paragraph role="paragraph" id="par_id571655653825780">The navigator shows the correspondence between the current document cursor location element and the navigator view, according to different categories: Headings, Tables, Hyperlinks and more. The element is displayed and highlighted in the Navigator content view. If the element is located in a collapsed layer, the required layers above it are automatically expanded and remain expanded afterwards.</paragraph>
@@ -64,6 +64,7 @@
<section id="navigateby">
<h2 id="hd_id321603114930016">Navigate By</h2>
<paragraph role="paragraph" id="par_id171603114951991">Use selection box to choose which type of item should be navigated, when using the Previous and Next buttons.</paragraph>
+ <section id="navigateby_arrows">
<h2 id="hd_id3150096">Previous</h2>
<paragraph id="par_id3148784" role="paragraph">Jumps to the previous item in the document. To specify the type of item to jump to, click the <emph>Navigate By</emph> list, and then click an item category - for example, "Images".</paragraph>
<table id="tbl_id3150044">
@@ -89,11 +90,14 @@
</tablecell>
</tablerow>
</table>
+ </section>
</section>
<bookmark branch="hid/modules/swriter/ui/navigatorpanel/numericfield" id="bm_id3148726" localize="false"/>
+ <section id="navigateby_pages">
<h2 id="hd_id3148715">Page number</h2>
<paragraph id="par_id3155548" role="paragraph"><ahelp hid="modules/swriter/ui/navigatorpanel/numericfield">Type the number of the page that you want to jump to, and then press Enter. Use the spin buttons to navigate.</ahelp></paragraph>
+ </section>
<h2 id="hd_id3146891">Content Navigation View</h2>
<paragraph id="par_id3145596" role="paragraph"><ahelp hid="modules/swriter/ui/navigatorpanel/root">Switches between the display of all categories in the Navigator and the selected category.</ahelp></paragraph>
@@ -175,7 +179,7 @@
<bookmark branch="hid/modules/swriter/ui/navigatorpanel/reminder" id="bm_id3155392" localize="false"/>
<h2 id="hd_id3155381">Set Reminder</h2>
-<paragraph id="par_id3153011" role="paragraph"><ahelp hid="." visibility="hidden">Click here to set a reminder at the current cursor position. You can define up to five reminders. To jump to a reminder, click the <link href="text/swriter/01/02110100.xhp"><emph>Navigation</emph></link> icon, in the <emph>Navigation</emph> window click the <emph>Reminder</emph> icon, and then click the <emph>Previous</emph> or <emph>Next</emph> button.</ahelp> Click here to set a reminder at the current cursor position. You can define up to five reminders. To jump to a reminder, click the <link href="text/swriter/01/02110100.xhp">Navigation</link> icon, in the Navigation window click the Reminder icon, and then click the Previous or Next button.</paragraph>
+<paragraph id="par_id3153011" role="paragraph"><ahelp hid="." visibility="hidden">Click here to set a reminder at the current cursor position. You can define up to five reminders. To jump to a reminder, click the <link href="text/swriter/01/02110100.xhp"><emph>Navigation</emph></link> icon, in the <emph>Navigation</emph> window click the <emph>Reminder</emph> icon, and then click the <emph>Previous</emph> or <emph>Next</emph> button.</ahelp> Click here to set a reminder at the current cursor position. You can define up to five reminders. To jump to a reminder, click the <link href="text/swriter/01/02110100.xhp">Navigate By</link> list, select <menuitem>Reminder</menuitem>, and then click <emph>Previous</emph> or <emph>Next</emph>.</paragraph>
<table id="tbl_id3154577">
<tablerow>
@@ -187,7 +191,9 @@
</tablecell>
</tablerow>
</table>
+ <section id="reminders_note">
<note id="par_id3495381">Reminders are navigated in the order in which they are set. Reminders are not saved when a document is closed.</note>
+ </section>
<bookmark branch="hid/modules/swriter/ui/navigatorpanel/headings" id="bm_id3150519" localize="false"/>
<bookmark branch="hid/SW_HID_NAV_OUTLINE_LEVEL" id="bm_id3156965" localize="false"/>
diff --git a/source/text/swriter/01/02110100.xhp b/source/text/swriter/01/02110100.xhp
index 889dc2c45b..573dd2a298 100644
--- a/source/text/swriter/01/02110100.xhp
+++ b/source/text/swriter/01/02110100.xhp
@@ -33,66 +33,53 @@
</meta>
<body>
<bookmark branch="hid/SW_HID_SCRL_NAVI" id="bm_id3149832" localize="false"/>
-<bookmark branch="hid/ .uno:AvailableToolbars?Toolbar:string=navigationobjectbar" id="bm_id731690546250138" localize="false"/>
-<h1 id="hd_id3147745">Navigation</h1>
-<paragraph role="paragraph" id="par_id3149844" xml-lang="en-US"><ahelp hid="HID_SCRL_NAVI">If you click this icon in the Navigator or in the lower right of the document window, a toolbar will appear which enables you to choose among the existing targets within a document.</ahelp> You can then use the up and down arrow icons to position the text cursor in the document on the previous or next target.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_HID_SCRL_PAGEUP" id="bm_id3153304" localize="false"/>
-<paragraph role="paragraph" id="par_id3153293" xml-lang="en-US"><ahelp hid="HID_SCRL_PAGEUP">Click the up button to scroll to the previous page or object.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_HID_SCRL_PAGEDOWN" id="bm_id3156109" localize="false"/>
-<paragraph role="paragraph" id="par_id3156098" xml-lang="en-US"><ahelp hid="HID_SCRL_PAGEDOWN">Click the down button to scroll to the next page or object.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id3155076" xml-lang="en-US">By default, as long as you have not selected any other entry, the arrow buttons jump to the previous or the next page in the document. The arrow buttons are black if you are browsing through pages and blue if you jump to other objects.</paragraph>
-<paragraph role="paragraph" id="par_id3154330" xml-lang="en-US">The entries largely correspond to those in the <link href="text/swriter/01/02110000.xhp">Navigator</link> selection box. You can also select other jump destinations. An example are the reminders, which you can set with the <emph>Set Reminder</emph> icon in the Navigator. You can select an object from among the following options on the <emph>Navigation</emph> toolbar: table, frame, graphics, OLE object, page, headings, reminder, drawing object, control field, section, bookmark, selection, footnote, note, index entry, table formula, wrong table formula.</paragraph>
-<paragraph role="paragraph" id="par_id3148330" xml-lang="en-US">Reminders are navigated in the order in which they are set.</paragraph>
-<paragraph role="paragraph" id="par_id3148783" xml-lang="en-US">For table formulas, you can either jump to all table formulas located within your document or only to the incorrect ones. For incorrect formulas, you jump only to formulas that have resulted in errors. The program skips over formulas with resulting errors (those that reference incorrect formulas).</paragraph>
-<h2 id="hd_id3150031">Working With the Navigation Toolbar</h2>
-<paragraph role="paragraph" id="par_id3150045" xml-lang="en-US">Open the <emph>Navigation</emph> toolbar by clicking on its top left icon located on the top of the Navigator display area. You can break the toolbar away from its place by dragging and arranging it on the screen.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_HID_NAVI_VS" id="bm_id3154622" localize="false"/>
-<paragraph role="paragraph" id="par_id3153141" xml-lang="en-US"><ahelp hid="HID_NAVI_VS">Click the icon for the type of objects you want to browse through. Then click one of the "Previous Object" or "Next Object" arrow buttons. The names of these buttons indicate the type of object you have selected. The text cursor is placed on whichever object you have selected.</ahelp></paragraph>
-<paragraph role="tip" id="par_id3149968" xml-lang="en-US">You can configure $[officename] according to your specific preferences for navigating within a document. To do this, choose <link href="text/shared/01/06140000.xhp"><emph>Tools - Customize</emph></link>. The various tables for adapting <link href="text/shared/01/06140100.xhp">menus</link>, <link href="text/shared/01/06140200.xhp">keyboard input</link> or toolbars contain various functions for navigation within the document under the "Navigate" area. In this way you can jump to the index tags in the document with the "To Next/Previous Index Tag" functions.</paragraph>
-<bookmark xml-lang="en-US" branch="index" id="bm_id3155338"><bookmark_value>searching; repeating a search</bookmark_value>
-</bookmark>
-<h2 id="hd_id3155338">Repeat Search</h2>
-<paragraph role="paragraph" id="par_id3155361" xml-lang="en-US">With the <emph>Repeat search</emph> icon on the <emph>Navigation</emph> toolbar you can repeat a search you started with the <emph>Search and Replace</emph> dialog. To do this, click the icon. The blue arrow buttons on the vertical scrollbar now take on the functions <emph>Continue search forwards</emph> and <emph>Continue search backwards</emph>. If you now click one of the arrow surfaces, the search will be continued for the term entered in the Search and Replace dialog.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_HID_NID_BKM" id="bm_id2258064" localize="false"/>
-<paragraph role="paragraph" id="par_idN106DD" xml-lang="en-US"><ahelp hid="." visibility="hidden">Select this icon to browse through bookmarks.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_HID_NID_CTRL" id="bm_id9021576" localize="false"/>
-<paragraph role="paragraph" id="par_idN106F4" xml-lang="en-US"><ahelp hid="." visibility="hidden">Select this icon to browse through control fields.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_HID_NID_DRW" id="bm_id4192327" localize="false"/>
-<paragraph role="paragraph" id="par_idN1070B" xml-lang="en-US"><ahelp hid="." visibility="hidden">Select this icon to browse through drawing objects.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_HID_NID_FRM" id="bm_id8498794" localize="false"/>
-<paragraph role="paragraph" id="par_idN10722" xml-lang="en-US"><ahelp hid="." visibility="hidden">Select this icon to browse through frames.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_HID_NID_FTN" id="bm_id66835" localize="false"/>
-<paragraph role="paragraph" id="par_idN10739" xml-lang="en-US"><ahelp hid="." visibility="hidden">Select this icon to browse through footnotes.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_HID_NID_GRF" id="bm_id7068697" localize="false"/>
-<paragraph role="paragraph" id="par_idN10750" xml-lang="en-US"><ahelp hid="." visibility="hidden">Select this icon to browse through graphics.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_HID_NID_INDEX_ENTRY" id="bm_id9798577.00000001" localize="false"/>
-<paragraph role="paragraph" id="par_idN10767" xml-lang="en-US"><ahelp hid="." visibility="hidden">Select this icon to browse through index entries.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_HID_NID_MARK" id="bm_id9345988" localize="false"/>
-<paragraph role="paragraph" id="par_idN1077E" xml-lang="en-US"><ahelp hid="." visibility="hidden">Select this icon to browse through reminders.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_HID_NID_NEXT" id="bm_id3960692" localize="false"/>
-<paragraph role="paragraph" id="par_idN10795" xml-lang="en-US"><ahelp hid="." visibility="hidden">Sets the cursor to the next object of the selected type.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_HID_NID_OLE" id="bm_id5234534" localize="false"/>
-<paragraph role="paragraph" id="par_idN107AF" xml-lang="en-US"><ahelp hid="." visibility="hidden">Select this icon to browse through OLE objects.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_HID_NID_OUTL" id="bm_id1883602" localize="false"/>
-<paragraph role="paragraph" id="par_idN107C6" xml-lang="en-US"><ahelp hid="." visibility="hidden">Select this icon to browse through headings.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_HID_NID_PGE" id="bm_id6152836" localize="false"/>
-<paragraph role="paragraph" id="par_idN107DD" xml-lang="en-US"><ahelp hid="." visibility="hidden">Select this icon to browse through pages.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_HID_NID_POSTIT" id="bm_id5230567" localize="false"/>
-<paragraph role="paragraph" id="par_idN107F4" xml-lang="en-US"><ahelp hid="." visibility="hidden">Select this icon to browse through comments.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_HID_NID_PREV" id="bm_id1692556" localize="false"/>
-<paragraph role="paragraph" id="par_idN1080B" xml-lang="en-US"><ahelp hid="." visibility="hidden">Sets the cursor to the previous object of the selected type.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_HID_NID_REG" id="bm_id9508651" localize="false"/>
-<paragraph role="paragraph" id="par_idN10829" xml-lang="en-US"><ahelp hid="." visibility="hidden">Select this icon to browse through sections.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_HID_NID_SEL" id="bm_id7225257" localize="false"/>
-<paragraph role="paragraph" id="par_idN10840" xml-lang="en-US"><ahelp hid="." visibility="hidden">Select this icon to browse through selections.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_HID_NID_SRCH_REP" id="bm_id1448408" localize="false"/>
-<paragraph role="paragraph" id="par_idN10857" xml-lang="en-US"><ahelp hid="." visibility="hidden">Select this icon to browse through search results.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_HID_NID_TABLE_FORMULA" id="bm_id7630237" localize="false"/>
-<paragraph role="paragraph" id="par_idN1086E" xml-lang="en-US"><ahelp hid="." visibility="hidden">Select this icon to browse through table formulas.</ahelp></paragraph>
-<!-- removed HID HID_NID_FORMULA_ERROR -->
-<bookmark xml-lang="en-US" branch="hid/SW_HID_NID_TABLE_FORMULA_ERROR" id="bm_id8653523" localize="false"/>
-<paragraph role="paragraph" id="par_idN10885" xml-lang="en-US"><ahelp hid="." visibility="hidden">Select this icon to browse through wrong table formulas.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_HID_NID_TBL" id="bm_id4498428" localize="false"/>
-<paragraph role="paragraph" id="par_idN1089C" xml-lang="en-US"><ahelp hid="." visibility="hidden">Select this icon to browse through tables.</ahelp></paragraph>
+<bookmark branch="hid/.uno:AvailableToolbars?Toolbar:string=navigationobjectbar" id="bm_id731690546250138" localize="false"/>
+<bookmark branch="hid/modules/swriter/ui/navigatorpanel/.uno:NavElement" id="bm_id321713404357993" localize="false"/>
+<h1 id="hd_id3147745">Navigate By</h1>
+
+ <paragraph role="paragraph" id="par_id3149844"><ahelp hid="HID_SCRL_NAVI">The <emph>Navigate By</emph> selection box allows choosing a category to navigate the document by, including pages, headings, sections, objects, fields, comments, latest search results and recency of cursor position.</ahelp> You can then use the <emph>Previous</emph> and <emph>Next</emph> arrow icons to position the text cursor in the document on the previous or next target.</paragraph>
+
+ <section id="howtoget">
+ <embed href="text/swriter/01/02110000.xhp#howtoget"/>
+ </section>
+
+ <h2 id="hd_id3150031">Working With Navigate By</h2>
+ <paragraph role="paragraph" id="par_id3155076">By default, as long as you have not selected any other category, the Page category is selected, and the arrows are replaced by a number field that can be used to go to the previous or the next page, or jump to a specific one.</paragraph>
+ <bookmark xml-lang="en-US" branch="hid/SW_HID_NAVI_VS" id="bm_id3154622" localize="false"/>
+ <paragraph role="paragraph" id="par_id3153141" xml-lang="en-US"><ahelp hid="HID_NAVI_VS">Once you select another category, you can use the "Previous" or "Next" arrow buttons. The labels of these buttons indicate the type of object you have selected. The text cursor is then placed on whichever object you have selected.</ahelp></paragraph>
+
+ <bookmark xml-lang="en-US" branch="hid/SW_HID_SCRL_PAGEUP" id="bm_id3153304" localize="false"/>
+ <bookmark xml-lang="en-US" branch="hid/SW_HID_SCRL_PAGEDOWN" id="bm_id3156109" localize="false"/>
+ <bookmark branch="hid/modules/swriter/ui/navigatorpanel/gotopage" id="bm_id641713404959460" localize="false"/>
+ <embed href="text/swriter/01/02110000.xhp#navigateby_pages"/>
+ <bookmark branch="hid/modules/swriter/ui/navigatorpanel/.uno:ScrollToPrevious" id="bm_id331713404689417" localize="false"/>
+ <bookmark branch="hid/modules/swriter/ui/navigatorpanel/.uno:ScrollToNext" id="bm_id311713404734071" localize="false"/>
+ <embed href="text/swriter/01/02110000.xhp#navigateby_arrows"/>
+
+ <tip id="par_id3149968">You can configure $[officename] according to your specific preferences for navigating within a document. To do this, choose <link href="text/shared/01/06140000.xhp"><emph>Tools - Customize</emph></link>. The various tables for adapting <link href="text/shared/01/06140100.xhp">menus</link>, <link href="text/shared/01/06140200.xhp">keyboard input</link> or toolbars contain various functions for navigation within the document under the "Navigate" category. For example, you can add buttons to a toolbar to jump to the index tags in the document with the "Go to Next/Previous Index Entry" commands.</tip>
+ <paragraph role="paragraph" id="par_id3154330">The available categories largely correspond to those in the <link href="text/swriter/01/02110000.xhp">Navigator</link> selection box. However, you can select other jump destinations that are not classic Navigator categories: for example, Reminders, Repeat Search or Recency.</paragraph>
+ <paragraph role="paragraph" id="par_id561713406417133">Select from one of the following options: Bookmarks, Comments, Controls, Drawing objects, Fields by type, Fields, Footnotes, Frames, Headings, Images, Indexes, OLE objects, Page, Recency, Reminder, Repeat search, Sections, Selection, Table formula, Tables, Wrong table formula.</paragraph>
+
+ <h2 id="hd_id1001713405229169">Footnotes</h2>
+ <paragraph role="paragraph" id="par_id541713405238672">Select the <emph>Footnotes</emph> category to jump between footnotes and endnotes. This can be used in conjunction with the <emph>Anchor ↔ Text</emph> button in the Navigator, to quickly jump between the text of the footnote/endnote and its anchor in the body.</paragraph>
+
+ <h2 id="hd_id801713406561353">Recency</h2>
+ <paragraph role="paragraph" id="par_id141713406574059">When selecting the <emph>Recency</emph> category, the <emph>Go back</emph> and <emph>Go forward</emph> buttons can be used to jump to recent cursor positions in the document.</paragraph>
+
+ <h2 id="hd_id701713405928808">Reminders</h2>
+ <paragraph role="paragraph" id="par_id871713405938067">Up to 5 <emph>Reminders</emph> (which are not saved when the document is closed) can be set at various locations in the document. Set a reminder with the <emph>Set Reminders</emph> button in the Navigator.</paragraph>
+ <embed href="text/swriter/01/02110000.xhp#reminders_note"/>
+
+ <bookmark xml-lang="en-US" branch="index" id="bm_id3155338"><bookmark_value>searching; repeating a search</bookmark_value>
+ </bookmark>
+ <h2 id="hd_id3155338">Repeat Search</h2>
+ <paragraph role="paragraph" id="par_id3155361">With the <menuitem>Repeat search</menuitem> category, you can repeat a search you started with the <emph>Search and Replace</emph> dialog or the <emph>Find</emph> toolbar. If you now click one of the arrows, the search will be resumed for the term last searched.</paragraph>
+
+ <h2 id="hd_id761713525529070">Selection</h2>
+ <paragraph role="paragraph" id="par_id961713525563573">If a multiple selection is active (for example when using <keycode>Ctrl + click and drag</keycode> or the Adding <link href="text/shared/02/20050000.xhp">selection mode</link>, or after a Find All search), <emph>Selection</emph> allows jumping from one to the other.</paragraph>
+
+ <h2 id="hd_id731713403460395">Table Formulas</h2>
+ <paragraph role="paragraph" id="par_id3148783">For table formulas, you can either jump to all table formulas located within your document with <emph>Table formula</emph> or only to the incorrect ones with <emph>Wrong table formula</emph>. For incorrect formulas, you jump only to formulas that have resulted in errors. The program skips over formulas with resulting errors (those that reference incorrect formulas).</paragraph>
+
</body>
</helpdocument>
diff --git a/source/text/swriter/01/04090001.xhp b/source/text/swriter/01/04090001.xhp
index 82787623fb..ae5e038c0f 100644
--- a/source/text/swriter/01/04090001.xhp
+++ b/source/text/swriter/01/04090001.xhp
@@ -28,8 +28,8 @@
<body>
<section id="document">
-<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/flddocumentpage/@@nowidget@@" id="bm_@@nowidget@@" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/flddocumentpage/FldDocumentPage" id="bm_id3145246" localize="false"/>
+<bookmark branch="hid/modules/swriter/ui/flddocumentpage/@@nowidget@@" id="bm_@@nowidget@@" localize="false"/>
+<bookmark branch="hid/modules/swriter/ui/flddocumentpage/FldDocumentPage" id="bm_id3145246" localize="false"/>
<h1 id="hd_id3150017"><link href="text/swriter/01/04090001.xhp">Document</link></h1>
<paragraph id="par_id3147167" role="paragraph"><ahelp hid=".">Fields are used to insert information about the current document, for example, file name, template, statistics, user data, date, and time.</ahelp></paragraph>
@@ -42,14 +42,14 @@
<paragraph role="paragraph" id="par_id911603998090123">To insert a field in your document, first select the field <emph>Type</emph>, then click in the <emph>Select</emph> list, to choose which information item should be inserted, then click <emph>Insert</emph>.</paragraph>
<section id="fieldtype">
-<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/flddocumentpage/type" id="bm_id3153666" localize="false"/>
+<bookmark branch="hid/modules/swriter/ui/flddocumentpage/type" id="bm_id3153666" localize="false"/>
<h2 id="hd_id3151312">Type</h2>
<paragraph id="par_id3153672" role="paragraph"><ahelp hid="modules/swriter/ui/flddocumentpage/type">Lists the available field types. </ahelp></paragraph>
</section>
<section id="select">
-<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/flddocumentpage/select" id="bm_id3150671" localize="false"/>
+<bookmark branch="hid/modules/swriter/ui/flddocumentpage/select" id="bm_id3150671" localize="false"/>
<h2 id="hd_id3150660">Select<comment>on "Document" and "DocInformation" tab page this is called "Select", on the other tab pages "Selection"</comment></h2>
<paragraph id="par_id3150678" role="paragraph"><ahelp hid="modules/swriter/ui/flddocumentpage/select">Lists what information can be inserted for a selected field type.</ahelp></paragraph>
@@ -108,7 +108,7 @@
</tablerow>
<tablerow>
<tablecell>
- <paragraph id="par_id821601755856152" role="tablecontent">Paragraph Signature</paragraph>
+ <paragraph id="par_id821601755856152" localize="false" role="tablecontent"><embedvar href="text/swriter/01/paragraph_signature.xhp#h1" markup="ignore"/></paragraph>
</tablecell>
<tablecell>
<paragraph id="par_id611601755863247" role="tablecontent">Inserts a meta-data field with a digital signature for the paragraph. You must have a digital certificate to sign a paragraph.</paragraph>
@@ -153,7 +153,7 @@
<tip id="par_id3155537">To quickly insert a field from the <emph>Select</emph> list, double-click the field.</tip>
<section id="format">
-<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/flddocumentpage/format" id="bm_id3145607" localize="false"/>
+<bookmark branch="hid/modules/swriter/ui/flddocumentpage/format" id="bm_id3145607" localize="false"/>
<h2 id="hd_id3145595">Format</h2>
<paragraph id="par_id3145613" role="paragraph"><ahelp hid="modules/swriter/ui/flddocumentpage/format">If a field is displaying a date, time or number, then <emph>Format</emph> is used to customize the appearance of the date, time, or number. Common formats are shown in the Format window, or click "Additional formats" to define a custom format.</ahelp></paragraph>
</section>
@@ -161,18 +161,18 @@
<paragraph id="par_id3156079" role="paragraph">For type <emph>Heading</emph>, choose the format <menuitem>Heading number</menuitem> to display the heading number with the separator specified in <link href="text/swriter/01/06060000.xhp"><menuitem>Tools - Heading Numbering</menuitem></link>.</paragraph>
<paragraph id="par_id3154867" role="paragraph">Choose <menuitem>Heading number without separator</menuitem> to display the heading number alone without the separator.</paragraph>
<paragraph role="paragraph" id="par_id741678670945615">If the selected heading is not numbered, then the field is left blank.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/flddocumentpage/fixed" id="bm_id3153014" localize="false"/>
+<bookmark branch="hid/modules/swriter/ui/flddocumentpage/fixed" id="bm_id3153014" localize="false"/>
<paragraph id="par_id0902200804313432" role="paragraph"><ahelp hid="." visibility="hidden">Inserts the field as static content, that is, the field cannot be updated.</ahelp></paragraph>
<note id="par_id3154470">For the HTML export and import of date and time fields, <link href="text/swriter/01/04090007.xhp#date_and_time">special $[officename] formats</link> are used.</note>
<embed href="text/swriter/01/04090004.xhp#fixedcontent"/>
-<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/flddocumentpage/level" id="bm_id3153038" localize="false"/>
+<bookmark branch="hid/modules/swriter/ui/flddocumentpage/level" id="bm_id3153038" localize="false"/>
<h3 id="hd_id3153026">Up to level</h3>
<paragraph id="par_id3154580" role="paragraph"><ahelp hid="modules/swriter/ui/flddocumentpage/level">Use this option with type <menuitem>Heading</menuitem> to specify which heading to display. The displayed heading is the first one before the field, whose outline level is equal to or less than the specified value.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/flddocumentpage/offset" id="bm_id3154610" localize="false"/>
+<bookmark branch="hid/modules/swriter/ui/flddocumentpage/offset" id="bm_id3154610" localize="false"/>
<section id="page_correction">
-<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/flddocumentpage/value" id="bm_id3150903" localize="false"/>
+<bookmark branch="hid/modules/swriter/ui/flddocumentpage/value" id="bm_id3150903" localize="false"/>
<h3 id="hd_id3150891">Offset</h3>
<paragraph id="par_id3155312" role="paragraph"><ahelp hid="modules/swriter/ui/flddocumentpage/value">Enter the offset value that you want to apply to a page number field, for example "+1".</ahelp></paragraph>
</section>
diff --git a/source/text/swriter/01/04090003.xhp b/source/text/swriter/01/04090003.xhp
index 38159f8751..0413bab7b6 100644
--- a/source/text/swriter/01/04090003.xhp
+++ b/source/text/swriter/01/04090003.xhp
@@ -151,7 +151,7 @@
<section id="macro">
<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/fldfuncpage/macro" id="bm_id3148889" localize="false"/>
<h2 id="hd_id3148877">Macro</h2>
-<paragraph role="paragraph" id="par_id3155912" xml-lang="en-US"><ahelp hid="modules/swriter/ui/fldfuncpage/macro">Opens the <emph>Macro Selector</emph>, where you can choose the macro that will run when you click the selected field in the document.</ahelp> This button is only available for the "Execute macro" function field.</paragraph>
+<paragraph role="paragraph" id="par_id3155912" xml-lang="en-US"><ahelp hid="modules/swriter/ui/fldfuncpage/macro">Opens the <emph>Macro Selector</emph> dialog, where you can choose the macro that will run when you click the selected field in the document.</ahelp> This button is only available for the "Execute macro" function field.</paragraph>
</section>
<paragraph role="paragraph" id="par_id3150111" xml-lang="en-US">The following controls are displayed for <emph>Input list</emph> fields:</paragraph>
<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/fldfuncpage/item" id="bm_id3155871" localize="false"/>
diff --git a/source/text/swriter/01/04090006.xhp b/source/text/swriter/01/04090006.xhp
index 6cc3eb7ceb..10c09e1039 100644
--- a/source/text/swriter/01/04090006.xhp
+++ b/source/text/swriter/01/04090006.xhp
@@ -110,7 +110,7 @@
<paragraph role="paragraph" id="par_id3150922" xml-lang="en-US"><ahelp hid="modules/swriter/ui/flddbpage/fromdatabasecb">Uses the format defined in the selected database.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/flddbpage/browse" id="bm_id5024262" localize="false"/>
<h3 id="par_idN1076E">Browse</h3>
-<paragraph role="paragraph" id="par_idN10772" xml-lang="en-US"><ahelp hid="modules/swriter/ui/flddbpage/browse">Opens a file open dialog where you can select a database file (*.odb). The selected file is added to the Databases Selection list.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_idN10772" xml-lang="en-US"><ahelp hid="modules/swriter/ui/flddbpage/browse">Opens the Open dialog where you can select a database file (*.odb). The selected file is added to the Databases Selection list.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/flddbpage/userdefinedcb" id="bm_id3154326" localize="false"/>
<h3 id="hd_id3155084">User defined</h3>
<paragraph role="paragraph" id="par_id3154333" xml-lang="en-US"><ahelp hid="modules/swriter/ui/flddbpage/userdefinedcb">Applies the format that you select in the <emph>List of user-defined formats</emph>.</ahelp></paragraph>
diff --git a/source/text/swriter/01/04150000.xhp b/source/text/swriter/01/04150000.xhp
index a216f40a62..425b295ad5 100644
--- a/source/text/swriter/01/04150000.xhp
+++ b/source/text/swriter/01/04150000.xhp
@@ -25,14 +25,13 @@
</topic>
</meta>
<body>
-<section id="inserttable">
<bookmark branch="hid/.uno:InsertTable" id="bm_id3151392" localize="false"/>
<bookmark branch="hid/modules/swriter/ui/inserttable/@@nowidget@@" id="bm_@@nowidget@@" localize="false"/>
<bookmark branch="hid/modules/swriter/ui/inserttable/InsertTableDialog" id="bm_id3151394" localize="false"/>
+<section id="inserttable">
<h1 id="hd_id3147402"><link href="text/swriter/01/04150000.xhp">Insert Table</link></h1>
-<paragraph role="paragraph" id="par_id3149355"><variable id="table_text"><variable id="tabelletext"><ahelp hid=".">Inserts a table into the document. You can also click the arrow, drag to select the number of rows and columns to include in the table, and then click in the last cell.</ahelp>
-</variable></variable></paragraph>
+<paragraph role="paragraph" id="par_id3149355"><variable id="tabelletext"><ahelp hid=".">Inserts a table into the document. You can also click the arrow, drag to select the number of rows and columns to include in the table, and then click in the last cell.</ahelp></variable></paragraph>
</section>
<section id="howtoget">
<embed href="text/swriter/00/00000404.xhp#insert_table"/>
diff --git a/source/text/swriter/01/04180400.xhp b/source/text/swriter/01/04180400.xhp
index 6d01142f38..cb1eafee42 100644
--- a/source/text/swriter/01/04180400.xhp
+++ b/source/text/swriter/01/04180400.xhp
@@ -59,7 +59,7 @@
<bookmark branch="hid/modules/swriter/ui/exchangedatabases/browse" id="bm_id9902035" localize="false"/>
<h2 id="par_idN106DB">Browse</h2>
-<paragraph id="par_idN106DF" role="paragraph"><ahelp hid="modules/swriter/ui/exchangedatabases/browse">Opens a file open dialog to select a database file (*.odb). The selected file is added to the Available Databases list.</ahelp></paragraph>
+<paragraph id="par_idN106DF" role="paragraph"><ahelp hid="modules/swriter/ui/exchangedatabases/browse">Opens the Open dialog to select a database file (*.odb). The selected file is added to the Available Databases list.</ahelp></paragraph>
<bookmark branch="hid/modules/swriter/ui/exchangedatabases/define" id="bm_id9902036" localize="false"/>
<h2 id="hd_id3149349">Define</h2>
diff --git a/source/text/swriter/01/05030200.xhp b/source/text/swriter/01/05030200.xhp
index 8b7e3e0527..6722ef29b4 100644
--- a/source/text/swriter/01/05030200.xhp
+++ b/source/text/swriter/01/05030200.xhp
@@ -48,18 +48,15 @@
<bookmark xml-lang="en-US" branch="hid/cui/ui/textflowpage/checkAuto" id="bm_id3147171" localize="false"/>
<h3 id="hd_id3153920">Automatically</h3>
<paragraph role="paragraph" id="par_id3154640" xml-lang="en-US"><ahelp hid="cui/ui/textflowpage/checkAuto">Automatically inserts hyphens where they are needed in a paragraph.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui/ui/textflowpage/checkNoCaps" id="bm_id3147172" localize="false"/>
-<h3 id="hd_id3153921">Don't hyphenate words in CAPS</h3>
-<paragraph role="paragraph" id="par_id3154648" xml-lang="en-US"><ahelp hid="cui/ui/textflowpage/checkNoCaps">Avoids hyphenating words written entirely in capital letters, such as initialisms.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui/ui/textflowpage/checkNoLastWord" id="bm_id3147176" localize="false"/>
-<h3 id="hd_id3153926">Don't hyphenate the last word</h3>
-<paragraph role="paragraph" id="par_id3154655" xml-lang="en-US"><ahelp hid="cui/ui/textflowpage/checkNoLastWord">Avoids hyphenating the last word of paragraphs. This feature can help prevent these words from being split up across pages, affecting readability.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/cui/ui/textflowpage/spinLineEnd" id="bm_id3149286" localize="false"/>
<h3 id="hd_id3150766">Characters at line end</h3>
<paragraph role="paragraph" id="par_id3149291" xml-lang="en-US"><ahelp hid="cui/ui/textflowpage/spinLineEnd">Enter the minimum number of characters to leave at the end of the line before a hyphen is inserted.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/cui/ui/textflowpage/spinLineBegin" id="bm_id3147508" localize="false"/>
<h3 id="hd_id3145413">Characters at line begin</h3>
<paragraph role="paragraph" id="par_id3147515" xml-lang="en-US"><ahelp hid="cui/ui/textflowpage/spinLineBegin">Enter the minimum number of characters that must appear at the beginning of the line after the hyphen.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/textflowpage/spinCompoundLineEnd" id="bm_id3147510" localize="false"/>
+<h3 id="hd_id3145415">Compound constituent characters at line end</h3>
+<paragraph role="paragraph" id="par_id3147518" xml-lang="en-US"><ahelp hid="cui/ui/textflowpage/spinCompoundLineEnd">Set 3 (or more) characters to improve the hyphenation in Danish, Dutch, German, Hungarian, Norwegian and Swedish by preferring the hyphenation between constituents of a compound word instead of breaking the second (third etc.) constituent right after its first 2 characters.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/cui/ui/textflowpage/spinMaxNum" id="bm_id3153530" localize="false"/>
<h3 id="hd_id3149804">Maximum consecutive hyphenated lines</h3>
<paragraph role="paragraph" id="par_id3153536" xml-lang="en-US"><ahelp hid="cui/ui/textflowpage/spinMaxNum">Enter the maximum number of consecutive lines that can be hyphenated.</ahelp></paragraph>
@@ -68,8 +65,24 @@
<paragraph role="paragraph" id="par_id3153548" xml-lang="en-US"><ahelp hid="cui/ui/textflowpage/spinMinLen">Enter the minimum word length in characters that can be hyphenated.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/cui/ui/textflowpage/spinHyphenZone" id="bm_id3153537" localize="false"/>
<h3 id="hd_id3149818">Hyphenation zone</h3>
-<paragraph role="paragraph" id="par_id3153549" xml-lang="en-US"><ahelp hid="cui/ui/textflowpage/spinHyphenZone">To reduce hyphenation, enter the length of the hyphenation zone. Instead of the possible hyphenation, the line will break between words, if the remaining horizontal space does not exceed the hyphenation zone. Hyphenation zone results in enlarged spaces between words in justified text, and greater distance from paragraph margins in non-justified text.
-</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3153549" xml-lang="en-US"><ahelp hid="cui/ui/textflowpage/spinHyphenZone">To reduce hyphenation, enter the length of the hyphenation zone. Instead of the possible hyphenation, the line will break between words, if the remaining horizontal space does not exceed the hyphenation zone. Hyphenation zone results in enlarged spaces between words in justified text, and greater distance from paragraph margins in non-justified text.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/textflowpage/checkNoCaps" id="bm_id3147172" localize="false"/>
+<h3 id="hd_id3153921">Hyphenate words in CAPS</h3>
+<paragraph role="paragraph" id="par_id3154648" xml-lang="en-US"><ahelp hid="cui/ui/textflowpage/checkNoCaps">Hyphenate words written entirely in capital letters, such as initialisms.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/textflowpage/checkNoLastWord" id="bm_id3147176" localize="false"/>
+<h3 id="hd_id3153926">Hyphenate last word</h3>
+<paragraph role="paragraph" id="par_id3154655" xml-lang="en-US"><ahelp hid="cui/ui/textflowpage/checkNoLastWord">Hyphenate the last word of paragraphs. Disabling this feature prevents the creation of almost empty lines containing only half a word.</ahelp></paragraph>
+<h2 id="hd_id3153667">Hyphenation across</h2>
+<paragraph role="paragraph" id="par_id3154669" xml-lang="en-US">Control hyphenation in the last line of a column, page or spread.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/textflowpage/checkKeepColumn" id="bm_id3147177" localize="false"/>
+<h3 id="hd_id3153928">Column</h3>
+<paragraph role="paragraph" id="par_id3154662" xml-lang="en-US"><ahelp hid="cui/ui/textflowpage/checkKeepColumn">Deselect this check box to prevent words from being hyphenated across a column or page.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/textflowpage/checkKeepPage" id="bm_id3147178" localize="false"/>
+<h3 id="hd_id3153929">Page</h3>
+<paragraph role="paragraph" id="par_id3154665" xml-lang="en-US"><ahelp hid="cui/ui/textflowpage/checkKeepPage">Deselect this check box to prevent words from being hyphenated across a page.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/textflowpage/checkKeepSpread" id="bm_id3147179" localize="false"/>
+<h3 id="hd_id3153930">Spread</h3>
+<paragraph role="paragraph" id="par_id3154666" xml-lang="en-US"><ahelp hid="cui/ui/textflowpage/checkKeepSpread">Deselect this check box to prevent words from being hyphenated across a spread. (A spread is a set of two pages that are visible to the reader at the same time.)</ahelp></paragraph>
<h2 id="hd_id3153665">Breaks</h2>
<paragraph role="paragraph" id="par_id3154470" xml-lang="en-US">Specify the page or column <link href="text/swriter/guide/page_break.xhp">break</link> options.</paragraph>
<bookmark xml-lang="en-US" branch="hid/cui/ui/textflowpage/checkInsert" id="bm_id3154567" localize="false"/>
diff --git a/source/text/swriter/01/05120400.xhp b/source/text/swriter/01/05120400.xhp
index a43577550d..2bea4c5486 100644
--- a/source/text/swriter/01/05120400.xhp
+++ b/source/text/swriter/01/05120400.xhp
@@ -31,9 +31,12 @@
<paragraph role="paragraph" id="par_idN1058C"><ahelp hid="." visibility="hidden">Inserts a row into the table.</ahelp></paragraph>
<bookmark branch="hid/.uno:InsertColumnDialog" id="bm_id3149874" localize="false"/>
<paragraph role="paragraph" id="par_idN105A7"><ahelp hid="." visibility="hidden">Inserts a column into the table.</ahelp></paragraph>
-<h1 id="hd_id3148489">Insert Columns/Rows</h1>
+
+<section id="insertcolumnsrows">
+ <h1 id="hd_id3148489"><variable id="h1"><link href="text/swriter/01/05120400.xhp">Insert Columns/Rows</link></variable></h1>
<paragraph role="paragraph" id="par_id3151241"><variable id="einfuegentext">Inserts a row or column into the table. This command is only available when the cursor is in a table.
-</variable></paragraph>
+ </variable></paragraph>
+</section>
<section id="howtoget">
<embed href="text/swriter/00/00000405.xhp#insert_columns_rows"/>
</section>
diff --git a/source/text/swriter/01/mailmerge01.xhp b/source/text/swriter/01/mailmerge01.xhp
index 191b8a4f42..7a5475e917 100644
--- a/source/text/swriter/01/mailmerge01.xhp
+++ b/source/text/swriter/01/mailmerge01.xhp
@@ -53,7 +53,7 @@
<paragraph role="paragraph" id="par_idN10576" xml-lang="en-US"><ahelp hid=".">Select the template that you want to create your mail merge document with.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmselectpage/browsetemplate" id="bm_id3173619" localize="false"/>
<h3 id="par_idN10579">Browse</h3>
-<paragraph role="paragraph" id="par_idN1057D" xml-lang="en-US"><ahelp hid=".">Opens a template selector dialog.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_idN1057D" xml-lang="en-US"><ahelp hid=".">Opens the New dialog to select a template.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmselectpage/recentdoc" id="bm_id6065248" localize="false"/>
<h2 id="par_idN10584">Start from a recently saved starting document</h2>
<paragraph role="paragraph" id="par_idN10588" xml-lang="en-US"><ahelp hid=".">Use an existing mail merge document as the base for a new mail merge document.</ahelp></paragraph>
diff --git a/source/text/swriter/01/paragraph_signature.xhp b/source/text/swriter/01/paragraph_signature.xhp
new file mode 100644
index 0000000000..f4b679c696
--- /dev/null
+++ b/source/text/swriter/01/paragraph_signature.xhp
@@ -0,0 +1,55 @@
+<?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="text/swriter/01/paragraph_signature.xhp" indexer="include" status="PUBLISH">
+ <title id="tit">Paragraph Signature</title>
+ <filename>/text/swriter/01/paragraph_signature.xhp</filename>
+ </topic>
+</meta>
+<body>
+<bookmark branch="index" id="bm_id121713380761462">
+ <bookmark_value>paragraph signature</bookmark_value>
+ <bookmark_value>insert;paragraph signature</bookmark_value>
+ <bookmark_value>paragraph signature;inserting</bookmark_value>
+</bookmark>
+<section id="para_signature">
+ <h1 id="hd_id881713200146819"><variable id="h1"><link href="text/swriter/01/paragraph_signature.xhp">Paragraph Signature</link></variable></h1>
+ <paragraph id="par_id921713200146822" role="paragraph">Adds a digital signature to the end of any paragraph. You must have a digital certificate to sign a paragraph. </paragraph>
+</section>
+<section id="howtoget">
+ <embed href="text/shared/00/00000004.xhp#from_menu_bar"/>
+ <paragraph role="paragraph" id="par_id131713363687715">Choose <menuitem>Insert - Field - More Fields - Document</menuitem> tab, choose <menuitem>Paragraph Signature</menuitem> in the <menuitem>Type</menuitem> box, click <menuitem>Insert</menuitem>.</paragraph>
+ <embed href="text/shared/00/00000004.xhp#from_tabUI"/>
+ <paragraph role="paragraph" id="par_id11713367261401">Choose <menuitem>Insert - Field - More Fields - Document</menuitem> tab, choose <menuitem>Paragraph Signature</menuitem> in the <menuitem>Type</menuitem> box, click <menuitem>Insert</menuitem>.</paragraph>
+ <paragraph role="paragraph" id="par_id271713381238721">Choose <menuitem>Home - Field - More Fields - Document</menuitem> tab, choose <menuitem>Paragraph Signature</menuitem> in the <menuitem>Type</menuitem> box, click <menuitem>Insert</menuitem>.</paragraph>
+ <embed href="text/shared/00/00000004.xhp#from_keyboard"/>
+ <paragraph role="paragraph" id="par_id81713381120150"><switchinline select="sys"><caseinline select="MAC"><keycode>Command</keycode></caseinline><defaultinline><keycode>Ctrl</keycode></defaultinline></switchinline><keycode> + F2</keycode> and choose <menuitem>Paragraph Signature</menuitem> in the <menuitem>Type</menuitem> box, click <menuitem>Insert</menuitem>.</paragraph>
+</section>
+
+<paragraph role="paragraph" id="par_id781713200328847">A paragraph signature includes meta-data for the user who created the signature and the date the signature was created. Either <emph>Valid</emph> or <emph>Invalid</emph> is displayed as text at the end of a paragraph signature. By default, it displays <emph>Valid</emph>. If the paragraph is modified in any way after the paragraph signature is added, the signature changes to <emph>Invalid</emph>.</paragraph>
+
+<note id="par_id11713381369787">Upon saving a document, any <emph>Invalid</emph> paragraph signatures are automatically deleted.</note>
+
+<paragraph role="paragraph" id="par_id721713200319243">A paragraph signature will indicate whether or not a particular paragraph has been modified at any time after the signature was inserted. Multiple paragraph signatures can be added, and each signature is independent from each other.</paragraph>
+
+<h2 id="hd_id351713200369156">To Insert a Paragraph Signature</h2>
+<paragraph role="paragraph" id="par_id271713363489589">After navigating to Paragraph Signature in the More Fields dialog, click Insert to open the Select Certificate dialog.</paragraph>
+<tip id="par_id81713200406731">A paragraph signature will always be inserted at the end of the currently selected paragraph. If the text cursor is not currently located within a paragraph of text, the Select Certificate dialog will not open.</tip>
+
+<paragraph role="paragraph" id="par_id471713368898713">The Select Certificate dialog lists any of your digital certificates that are available for use. Choose the desired certificate and select <emph>Sign</emph> to insert a paragraph signature using the chosen digital certificate.</paragraph>
+
+<note id="par_id581713367684220">You must have a digital certificate in order to begin <link href="text/shared/guide/digitalsign_send.xhp">Applying Digital Signatures</link>.</note>
+<section id="relatedtopics">
+ <paragraph role="paragraph" id="par_id1001713380135428" localize="false"><embedvar href="text/shared/guide/digital_signatures.xhp#digital_signatures" markup="ignore"/></paragraph>
+</section>
+</body>
+</helpdocument>
diff --git a/source/text/swriter/guide/dragdroptext.xhp b/source/text/swriter/guide/dragdroptext.xhp
index b19ebb995a..37712916ce 100644
--- a/source/text/swriter/guide/dragdroptext.xhp
+++ b/source/text/swriter/guide/dragdroptext.xhp
@@ -54,7 +54,7 @@
<embed href="text/shared/guide/dragdrop.xhp#dragdrop"/>
<embed href="text/shared/guide/dragdrop_graphic.xhp#dragdrop_graphic"/>
<embed href="text/shared/guide/dragdrop_table.xhp#dragdrop_table"/>
- <embed href="text/shared/guide/dragdrop_fromgallery.xhp#dragdrop_fromgallery"/>
+ <embed href="text/shared/guide/gallery_insert.xhp#gallery_insert"/>
<embed href="text/shared/guide/dragdrop_gallery.xhp#dragdrop_gallery"/>
</section>
</body>
diff --git a/source/text/swriter/guide/insert_graphic.xhp b/source/text/swriter/guide/insert_graphic.xhp
index 54aeac21b2..2271ece0a7 100644
--- a/source/text/swriter/guide/insert_graphic.xhp
+++ b/source/text/swriter/guide/insert_graphic.xhp
@@ -39,7 +39,7 @@
</variable></paragraph>
<paragraph role="paragraph" id="par_id3149695" xml-lang="en-US">There are several ways to insert a graphic object in a text document.</paragraph>
<embed href="text/swriter/guide/insert_graphic_dialog.xhp#insert_graphic_dialog"/>
-<embed href="text/swriter/guide/insert_graphic_gallery.xhp#insert_graphic_gallery"/>
+<embed href="text/shared/guide/gallery_insert.xhp#gallery_insert"/>
<embed href="text/swriter/guide/insert_graphic_scan.xhp#insert_graphic_scan"/>
<embed href="text/swriter/guide/insert_graphic_fromdraw.xhp#insert_graphic_fromdraw"/>
<embed href="text/swriter/guide/insert_graphic_fromchart.xhp#insert_graphic_fromchart"/>
diff --git a/source/text/swriter/guide/insert_graphic_dialog.xhp b/source/text/swriter/guide/insert_graphic_dialog.xhp
index 2bb8a2eb81..c8d04a9d7e 100644
--- a/source/text/swriter/guide/insert_graphic_dialog.xhp
+++ b/source/text/swriter/guide/insert_graphic_dialog.xhp
@@ -37,7 +37,7 @@
<paragraph xml-lang="en-US" id="par_id3153396" role="paragraph">By default, the inserted graphic is centered above the paragraph that you clicked in.</paragraph>
<section id="relatedtopics">
<embed href="text/swriter/guide/insert_graphic.xhp#insert_graphic"/>
-<embed href="text/swriter/guide/insert_graphic_gallery.xhp#insert_graphic_gallery"/>
+<embed href="text/shared/guide/gallery_insert.xhp#gallery_insert"/>
<embed href="text/swriter/guide/insert_graphic_scan.xhp#insert_graphic_scan"/>
<embed href="text/swriter/guide/insert_graphic_fromdraw.xhp#insert_graphic_fromdraw"/>
<embed href="text/swriter/guide/insert_graphic_fromchart.xhp#insert_graphic_fromchart"/>
diff --git a/source/text/swriter/guide/insert_graphic_fromchart.xhp b/source/text/swriter/guide/insert_graphic_fromchart.xhp
index 649e721c55..e9c72dff27 100644
--- a/source/text/swriter/guide/insert_graphic_fromchart.xhp
+++ b/source/text/swriter/guide/insert_graphic_fromchart.xhp
@@ -21,40 +21,39 @@
<meta>
- <topic id="textswriterguideinsert_graphic_fromchartxml" indexer="include"
- status="PUBLISH">
- <title xml-lang="en-US" id="tit">Inserting a Calc Chart into a Text Document</title>
+ <topic id="textswriterguideinsert_graphic_fromchartxml" indexer="include" status="PUBLISH">
+ <title id="tit">Inserting a Calc Chart into a Text Document</title>
<filename>/text/swriter/guide/insert_graphic_fromchart.xhp</filename>
</topic>
</meta>
<body>
-<bookmark xml-lang="en-US" branch="index" id="bm_id3152999"><bookmark_value>charts;copying from Calc into Writer</bookmark_value>
+<bookmark branch="index" id="bm_id3152999"><bookmark_value>charts;copying from Calc into Writer</bookmark_value>
<bookmark_value>copying; charts from $[officename] Calc</bookmark_value>
<bookmark_value>text documents;inserting Calc charts</bookmark_value>
</bookmark>
-<paragraph xml-lang="en-US" id="hd_id3152999" role="heading" level="1"><variable id="insert_graphic_fromchart"><link href="text/swriter/guide/insert_graphic_fromchart.xhp">Inserting a Calc Chart into a Text Document</link>
-</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3155890" role="paragraph">You can insert a copy of a chart that is not updated when you modify the chart data in the spreadsheet.</paragraph>
+<h1 id="hd_id3152999"><variable id="insert_graphic_fromchart"><link href="text/swriter/guide/insert_graphic_fromchart.xhp">Inserting a Calc Chart into a Text Document</link>
+</variable></h1>
+ <paragraph id="par_id3155890" role="paragraph">You can insert a copy of a chart that is not updated when you modify the chart data in the spreadsheet.</paragraph>
<list type="ordered">
<listitem>
- <paragraph xml-lang="en-US" id="par_id3149054" role="listitem">Open the text document that you want to copy the chart to.</paragraph>
+ <paragraph id="par_id3149054" role="listitem">Open the text document that you want to copy the chart to.</paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_id3155854" role="listitem">Open the spreadsheet containing the chart that you want to copy.</paragraph>
+ <paragraph id="par_id3155854" role="listitem">Open the spreadsheet containing the chart that you want to copy.</paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_id3153396" role="listitem">In the spreadsheet, click the chart. Eight handles appear.</paragraph>
+ <paragraph id="par_id3153396" role="listitem">In the spreadsheet, click the chart. Eight handles appear.</paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_id3153414" role="listitem">Drag the chart from the spreadsheet to the text document.</paragraph>
+ <paragraph id="par_id3153414" role="listitem">Drag the chart from the spreadsheet to the text document.</paragraph>
</listitem>
</list>
- <paragraph xml-lang="en-US" id="par_id3145102" role="paragraph">You can resize and move the chart in the text document as you would any object. To edit the chart data, double-click the chart.</paragraph>
+ <paragraph id="par_id3145102" role="paragraph">You can resize and move the chart in the text document as you would any object. To edit the chart data, double-click the chart.</paragraph>
<section id="relatedtopics">
<embed href="text/swriter/guide/insert_graphic.xhp#insert_graphic"/>
<embed href="text/swriter/guide/insert_graphic_dialog.xhp#insert_graphic_dialog"/>
- <embed href="text/swriter/guide/insert_graphic_gallery.xhp#insert_graphic_gallery"/>
+ <embed href="text/shared/guide/gallery_insert.xhp#gallery_insert"/>
<embed href="text/swriter/guide/insert_graphic_scan.xhp#insert_graphic_scan"/>
<embed href="text/swriter/guide/insert_graphic_fromdraw.xhp#insert_graphic_fromdraw"/>
<embed href="text/shared/guide/insert_graphic_drawit.xhp#insert_graphic_drawit"/>
diff --git a/source/text/swriter/guide/insert_graphic_fromdraw.xhp b/source/text/swriter/guide/insert_graphic_fromdraw.xhp
index 8751fa0ddc..3106e4b6cb 100644
--- a/source/text/swriter/guide/insert_graphic_fromdraw.xhp
+++ b/source/text/swriter/guide/insert_graphic_fromdraw.xhp
@@ -53,7 +53,7 @@
<section id="relatedtopics">
<embed href="text/swriter/guide/insert_graphic.xhp#insert_graphic"/>
<embed href="text/swriter/guide/insert_graphic_dialog.xhp#insert_graphic_dialog"/>
-<embed href="text/swriter/guide/insert_graphic_gallery.xhp#insert_graphic_gallery"/>
+<embed href="text/shared/guide/gallery_insert.xhp#gallery_insert"/>
<embed href="text/swriter/guide/insert_graphic_scan.xhp#insert_graphic_scan"/>
<embed href="text/swriter/guide/insert_graphic_fromchart.xhp#insert_graphic_fromchart"/>
<embed href="text/shared/guide/insert_graphic_drawit.xhp#insert_graphic_drawit"/>
diff --git a/source/text/swriter/guide/insert_graphic_gallery.xhp b/source/text/swriter/guide/insert_graphic_gallery.xhp
deleted file mode 100644
index 072762b4c0..0000000000
--- a/source/text/swriter/guide/insert_graphic_gallery.xhp
+++ /dev/null
@@ -1,53 +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="textswriterguideinsert_graphic_galleryxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Inserting Graphics From the Gallery With Drag-and-Drop</title>
-<filename>/text/swriter/guide/insert_graphic_gallery.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-</history>
-</meta>
-<body>
-<bookmark xml-lang="en-US" branch="index" id="bm_id3145083"><bookmark_value>inserting; from Gallery into text</bookmark_value>
-<bookmark_value>pictures; inserting from Gallery into text</bookmark_value>
-<bookmark_value>replacing;objects from Gallery</bookmark_value>
-</bookmark>
-<paragraph role="heading" id="hd_id3145083" xml-lang="en-US" level="1"><variable id="insert_graphic_gallery"><link href="text/swriter/guide/insert_graphic_gallery.xhp">Inserting Graphics From the Gallery With Drag-and-Drop</link>
-</variable></paragraph>
-<paragraph role="paragraph" id="par_id3155907" xml-lang="en-US">You can drag-and-drop an object from the gallery into a text document, spreadsheet, drawing, or presentation.</paragraph>
-<paragraph role="paragraph" id="par_id3155923" xml-lang="en-US">To replace a gallery object that you inserted in a document, hold down Shift+Ctrl, and then drag a different gallery object onto the object.</paragraph>
-
-<section id="relatedtopics">
-<embed href="text/swriter/guide/insert_graphic.xhp#insert_graphic"/>
-<embed href="text/swriter/guide/insert_graphic_dialog.xhp#insert_graphic_dialog"/>
-<embed href="text/swriter/guide/insert_graphic_scan.xhp#insert_graphic_scan"/>
-<embed href="text/swriter/guide/insert_graphic_fromdraw.xhp#insert_graphic_fromdraw"/>
-<embed href="text/swriter/guide/insert_graphic_fromchart.xhp#insert_graphic_fromchart"/>
-<embed href="text/shared/guide/insert_graphic_drawit.xhp#insert_graphic_drawit"/>
-</section>
-</body>
-</helpdocument>
diff --git a/source/text/swriter/guide/insert_graphic_scan.xhp b/source/text/swriter/guide/insert_graphic_scan.xhp
index b481806975..0def0818b8 100644
--- a/source/text/swriter/guide/insert_graphic_scan.xhp
+++ b/source/text/swriter/guide/insert_graphic_scan.xhp
@@ -52,7 +52,7 @@
<section id="relatedtopics">
<embed href="text/swriter/guide/insert_graphic.xhp#insert_graphic"/>
<embed href="text/swriter/guide/insert_graphic_dialog.xhp#insert_graphic_dialog"/>
- <embed href="text/swriter/guide/insert_graphic_gallery.xhp#insert_graphic_gallery"/>
+ <embed href="text/shared/guide/gallery_insert.xhp#gallery_insert"/>
<embed href="text/swriter/guide/insert_graphic_fromdraw.xhp#insert_graphic_fromdraw"/>
<embed href="text/swriter/guide/insert_graphic_fromchart.xhp#insert_graphic_fromchart"/>
<embed href="text/shared/guide/insert_graphic_drawit.xhp#insert_graphic_drawit"/>
diff --git a/source/text/swriter/guide/main.xhp b/source/text/swriter/guide/main.xhp
index 4db3b836b0..333c83ec91 100644
--- a/source/text/swriter/guide/main.xhp
+++ b/source/text/swriter/guide/main.xhp
@@ -120,7 +120,7 @@
<embed href="text/shared/guide/insert_bitmap.xhp#insert_bitmap"/>
<embed href="text/swriter/guide/insert_graphic_dialog.xhp#insert_graphic_dialog"/>
<embed href="text/swriter/guide/insert_graphic_fromdraw.xhp#insert_graphic_fromdraw"/>
-<embed href="text/swriter/guide/insert_graphic_gallery.xhp#insert_graphic_gallery"/>
+<embed href="text/shared/guide/gallery_insert.xhp#gallery_insert"/>
<embed href="text/swriter/guide/insert_graphic_scan.xhp#insert_graphic_scan"/>
<embed href="text/swriter/guide/insert_graphic_fromchart.xhp#insert_graphic_fromchart"/>
<embed href="text/swriter/guide/text_animation.xhp#text_animation"/>
diff --git a/source/text/swriter/main0110.xhp b/source/text/swriter/main0110.xhp
index 50e057799d..dd809cec74 100644
--- a/source/text/swriter/main0110.xhp
+++ b/source/text/swriter/main0110.xhp
@@ -27,48 +27,99 @@
<body>
-<section id="table">
<bookmark branch="hid/.uno:TableMenu" id="bm_id1366008" localize="false"/>
+<section id="table">
<h1 id="par_idN10553"><variable id="h1"><link href="text/swriter/main0110.xhp">Table</link></variable></h1>
<paragraph id="par_idN10563" role="paragraph"><ahelp hid=".">Shows commands to insert, edit, and delete a table and its elements inside a text document.</ahelp></paragraph>
</section>
+
<section id="howtoget">
<embed href="text/shared/00/00000004.xhp#from_menu_bar"/>
- <paragraph role="paragraph" id="par_id381693604855427">Choose <menuitem>Table</menuitem>.</paragraph>
+ <switch select="appl">
+ <case select="WRITER">
+ <paragraph role="paragraph" id="par_id381693604855427">Choose <menuitem>Table</menuitem>.</paragraph>
+ </case>
+ <case select="CALC"></case>
+ <default>
+ <paragraph role="paragraph" id="par_id751713467207034">Choose <menuitem>Format - Table</menuitem>.</paragraph>
+ </default>
+ </switch>
</section>
-<h2 id="par_idN105B5"><link href="text/swriter/01/04150000.xhp">Insert Table</link></h2>
-<paragraph id="par_idN105B8" role="paragraph">Inserts a new table.</paragraph>
-
-<embed href="text/swriter/01/TableInsertMenu.xhp#insertmenu"/>
-<embed href="text/swriter/01/TableDeleteMenu.xhp#deletemenu"/>
-<embed href="text/swriter/01/TableSelectMenu.xhp#selectmenu"/>
-<embed href="text/swriter/01/TableAutoFitMenu.xhp#table_size_menu"/>
-
-<embed href="text/shared/01/05100100.xhp#merge_cells"/>
-<embed href="text/shared/01/05100200.xhp#split_cells"/>
-
-<embed href="text/swriter/01/05200000.xhp#merge_table"/>
-<embed href="text/swriter/01/05190000.xhp#split_table"/>
-
-<embed href="text/shared/01/Protect.xhp#protect"/>
-<embed href="text/swriter/01/05100400.xhp#unprotect"/>
-
-<embed href="text/shared/01/AutoFormat.xhp#autoformat"/>
-
-<embed href="text/shared/01/05020300.xhp#numbersh1"/>
-
-<embed href="text/swriter/01/TableNumberRecognition.xhp#numberrecognition"/>
-<embed href="text/swriter/01/HeadingRowsRepeat.xhp#HeadingRowsRepeat"/>
-
-<embed href="text/swriter/01/RowSplit.xhp#rowsplit"/>
-
-<embed href="text/swriter/01/TableConvertMenu.xhp#convertmenu"/>
-
-<embed href="text/swriter/main0214.xhp#formula_bar"/>
-<embed href="text/swriter/01/06100000.xhp#sorttable"/>
-
-
+<switch select="appl">
+ <case select="WRITER">
+ <embed href="text/swriter/01/04150000.xhp#inserttable"/>
+
+ <embed href="text/swriter/01/TableInsertMenu.xhp#insertmenu"/>
+ <embed href="text/swriter/01/TableDeleteMenu.xhp#deletemenu"/>
+ <embed href="text/swriter/01/TableSelectMenu.xhp#selectmenu"/>
+ <embed href="text/swriter/01/TableAutoFitMenu.xhp#table_size_menu"/>
+
+ <embed href="text/shared/01/05100100.xhp#merge_cells"/>
+ <embed href="text/shared/01/05100200.xhp#split_cells"/>
+
+ <embed href="text/swriter/01/05200000.xhp#merge_table"/>
+ <embed href="text/swriter/01/05190000.xhp#split_table"/>
+
+ <embed href="text/shared/01/Protect.xhp#protect"/>
+ <embed href="text/swriter/01/05100400.xhp#unprotect"/>
+
+ <embed href="text/shared/01/AutoFormat.xhp#autoformat"/>
+
+ <embed href="text/shared/01/05020300.xhp#numbersh1"/>
+
+ <embed href="text/swriter/01/TableNumberRecognition.xhp#numberrecognition"/>
+ <embed href="text/swriter/01/HeadingRowsRepeat.xhp#HeadingRowsRepeat"/>
+
+ <embed href="text/swriter/01/RowSplit.xhp#rowsplit"/>
+
+ <embed href="text/swriter/01/TableConvertMenu.xhp#convertmenu"/>
+
+ <embed href="text/swriter/main0214.xhp#formula_bar"/>
+ <embed href="text/swriter/01/06100000.xhp#sorttable"/>
+ </case>
+ <case select="CALC"></case>
+ <case select="IMPRESS">
+ <embed href="text/shared/01/minimal_row_height.xhp#minimal_row_height"/>
+ <embed href="text/shared/01/SetOptimalRowHeight.xhp#optimal_row_height"/>
+ <embed href="text/shared/01/05110600m.xhp#distribute_rows_equally"/>
+ <embed href="text/shared/01/EntireRow.xhp#entire_row"/>
+ <embed href="text/swriter/01/05120400.xhp#insertcolumnsrows"/>
+ <embed href="text/shared/01/DeleteRows.xhp#delete_rows"/>
+
+ <embed href="text/shared/01/minimal_column_width.xhp#minimal_column_width"/>
+ <embed href="text/shared/01/SetOptimalColumnWidth.xhp#optimal_column_width"/>
+ <embed href="text/shared/01/05120600.xhp#distribute_columns_equally"/>
+ <embed href="text/shared/01/EntireColumn.xhp#entire_column"/>
+ <embed href="text/swriter/01/05120400.xhp#insertcolumnsrows"/>
+ <embed href="text/shared/01/DeleteColumns.xhp#delete_columns"/>
+
+ <embed href="text/shared/01/05100100.xhp#merge_cells"/>
+ <embed href="text/shared/01/05100200.xhp#split_cells"/>
+ <embed href="text/shared/01/DeleteTable.xhp#delete_table"/>
+ <embed href="text/shared/01/SelectTable.xhp#select_table"/>
+ </case>
+ <case select="DRAW">
+ <embed href="text/shared/01/minimal_row_height.xhp#minimal_row_height"/>
+ <embed href="text/shared/01/SetOptimalRowHeight.xhp#optimal_row_height"/>
+ <embed href="text/shared/01/05110600m.xhp#distribute_rows_equally"/>
+ <embed href="text/shared/01/EntireRow.xhp#entire_row"/>
+ <embed href="text/swriter/01/05120400.xhp#insertcolumnsrows"/>
+ <embed href="text/shared/01/DeleteRows.xhp#delete_rows"/>
+
+ <embed href="text/shared/01/minimal_column_width.xhp#minimal_column_width"/>
+ <embed href="text/shared/01/SetOptimalColumnWidth.xhp#optimal_column_width"/>
+ <embed href="text/shared/01/05120600.xhp#distribute_columns_equally"/>
+ <embed href="text/shared/01/EntireColumn.xhp#entire_column"/>
+ <embed href="text/swriter/01/05120400.xhp#insertcolumnsrows"/>
+ <embed href="text/shared/01/DeleteColumns.xhp#delete_columns"/>
+
+ <embed href="text/shared/01/05100100.xhp#merge_cells"/>
+ <embed href="text/shared/01/05100200.xhp#split_cells"/>
+ <embed href="text/shared/01/DeleteTable.xhp#delete_table"/>
+ <embed href="text/shared/01/SelectTable.xhp#select_table"/>
+ </case>
+</switch>
<h2 id="par_idN10617"><link href="text/swriter/01/05090000.xhp">Properties</link></h2>
<embed href="text/swriter/01/05090000.xhp#tabletext"/>
</body>
diff --git a/source/text/swriter/main0202.xhp b/source/text/swriter/main0202.xhp
index c6500f7129..1f501a63b3 100644
--- a/source/text/swriter/main0202.xhp
+++ b/source/text/swriter/main0202.xhp
@@ -20,15 +20,15 @@
<meta>
<topic id="textswritermain0202xml" indexer="include" status="PUBLISH">
- <title xml-lang="en-US" id="tit">Formatting Bar</title>
+ <title id="tit">Formatting Bar</title>
<filename>/text/swriter/main0202.xhp</filename>
</topic>
</meta>
<body>
<bookmark branch="hid/.uno:AvailableToolbars?Toolbar:string=textobjectbar" id="bm_id631690936585399" localize="false"/>
<section id="formatting_bar">
-<h1 xml-lang="en-US" id="hd_id3154270"><link href="text/swriter/main0202.xhp">Formatting Bar</link></h1>
- <paragraph xml-lang="en-US" id="par_id3147762" role="paragraph">The Formatting bar contains several text formatting functions.</paragraph>
+<h1 id="hd_id3154270"><link href="text/swriter/main0202.xhp">Formatting Bar</link></h1>
+ <paragraph id="par_id3147762" role="paragraph">The Formatting bar contains several text formatting functions.</paragraph>
</section>
<embed href="text/shared/02/01230000.xhp#stylist"/>
<embed href="text/shared/00/00040500.xhp#systylist"/>
@@ -59,54 +59,54 @@
<embed href="text/swriter/02/06040000.xhp#nolist"/>
<embed href="text/swriter/02/06040000.xhp#synolist"/>
<embed href="text/shared/02/02130000.xhp#indentdecrease"/>
- <embed href="text/shared/02/02130000.xhp#indentdecreaseicon"/>
+ <embed href="text/shared/00/00040502.xhp#sydecrease_ident"/>
<embed href="text/shared/02/02140000.xhp#indentincrease"/>
- <embed href="text/shared/02/02140000.xhp#indentincreaseicon"/>
- <h2 xml-lang="en-US" id="hd_id3149593"><link href="text/shared/01/05020200.xhp#FontColor">Font Color</link></h2>
+ <embed href="text/shared/00/00040502.xhp#syincrease_ident"/>
+ <h2 id="hd_id3149593"><link href="text/shared/01/05020200.xhp#FontColor">Font Color</link></h2>
<embed href="text/shared/01/05020200.xhp#textfarbe"/>
<embed href="text/shared/00/00000004.xhp#syfont_color"/>
<embed href="text/shared/02/02160000.xhp#character_highlight"/>
<embed href="text/shared/02/02160000.xhp#sycharacter_highlight"/>
<embed href="text/shared/02/02170000.xhp#background_color"/>
<embed href="text/shared/02/02170000.xhp#sybackground_color"/>
- <h2 xml-lang="en-US" id="hd_id3149887">Additional icons</h2>
-<h2 xml-lang="en-US" id="hd_id0122200903085320">Increase Font</h2>
+ <h2 id="hd_id3149887">Additional icons</h2>
+<h2 id="hd_id0122200903085320">Increase Font</h2>
<section id="increasesize">
- <bookmark xml-lang="en-US" branch="hid/.uno:Grow" id="bm_id0122200902451213" localize="false"/>
- <paragraph xml-lang="en-US" id="par_id0122200903085371" role="paragraph"><ahelp hid=".">Increases the font size of the selected text.</ahelp></paragraph>
+ <bookmark branch="hid/.uno:Grow" id="bm_id0122200902451213" localize="false"/>
+ <paragraph id="par_id0122200903085371" role="paragraph"><ahelp hid=".">Increases the font size of the selected text.</ahelp></paragraph>
</section>
-<h2 xml-lang="en-US" id="hd_id012220090308532">Reduce Font</h2>
+<h2 id="hd_id012220090308532">Reduce Font</h2>
<section id="decreasesize">
- <bookmark xml-lang="en-US" branch="hid/.uno:Shrink" id="bm_id0122200902452932" localize="false"/>
- <paragraph xml-lang="en-US" id="par_id0122200903085351" role="paragraph"><ahelp hid=".">Reduces the font size of the selected text.</ahelp></paragraph>
+ <bookmark branch="hid/.uno:Shrink" id="bm_id0122200902452932" localize="false"/>
+ <paragraph id="par_id0122200903085351" role="paragraph"><ahelp hid=".">Reduces the font size of the selected text.</ahelp></paragraph>
</section>
- <paragraph xml-lang="en-US" id="par_id3149900" role="paragraph">If <link href="text/shared/00/00000005.xhp#ctl">CTL</link> support is enabled, two additional icons are visible.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/.uno:ParaLeftToRight" id="bm_id2946959" localize="false"/>
-<h2 xml-lang="en-US" id="hd_id3149946">Left-To-Right</h2>
+ <paragraph id="par_id3149900" role="paragraph">If <link href="text/shared/00/00000005.xhp#ctl">CTL</link> support is enabled, two additional icons are visible.</paragraph>
+<bookmark branch="hid/.uno:ParaLeftToRight" id="bm_id2946959" localize="false"/>
+<h2 id="hd_id3149946">Left-To-Right</h2>
<table id="tbl_id2270882">
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="par_idN10784" role="tablecontent">
-<image id="img_id8354747" src="cmd/sc_paralefttoright.png" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id8354747">left to right icon</alt>
+ <paragraph id="par_idN10784" role="tablecontent">
+<image id="img_id8354747" src="cmd/sc_paralefttoright.png" width="1cm" height="1cm"><alt id="alt_id8354747">left to right icon</alt>
</image></paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3149964" role="paragraph"><ahelp hid=".uno:ParaLeftToRight">The text is entered from left to right.</ahelp></paragraph>
+ <paragraph id="par_id3149964" role="paragraph"><ahelp hid=".uno:ParaLeftToRight">The text is entered from left to right.</ahelp></paragraph>
</tablecell>
</tablerow>
</table>
-<bookmark xml-lang="en-US" branch="hid/.uno:ParaRightToLeft" id="bm_id25480" localize="false"/>
-<h2 xml-lang="en-US" id="hd_id3147300">Right-To-Left</h2>
+<bookmark branch="hid/.uno:ParaRightToLeft" id="bm_id25480" localize="false"/>
+<h2 id="hd_id3147300">Right-To-Left</h2>
<table id="tbl_id3011566">
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="par_idN107DF" role="tablecontent">
-<image id="img_id2405774" src="cmd/sc_pararighttoleft.png" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id2405774">right to left icon</alt>
+ <paragraph id="par_idN107DF" role="tablecontent">
+<image id="img_id2405774" src="cmd/sc_pararighttoleft.png" width="1cm" height="1cm"><alt id="alt_id2405774">right to left icon</alt>
</image></paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3147625" role="paragraph"><ahelp hid=".uno:ParaRightToLeft">The text formatted in a complex text layout language is entered from right to left.</ahelp></paragraph>
+ <paragraph id="par_id3147625" role="paragraph"><ahelp hid=".uno:ParaRightToLeft">The text formatted in a complex text layout language is entered from right to left.</ahelp></paragraph>
</tablecell>
</tablerow>
</table>