summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
Diffstat (limited to 'source')
-rw-r--r--source/auxiliary/scalc.tree2
-rw-r--r--source/media/files/scalc/am/conditionalformatting.odsbin0 -> 27042 bytes
-rw-r--r--source/media/files/scalc/ar/conditionalformatting.odsbin0 -> 27042 bytes
-rw-r--r--source/media/files/scalc/ast/conditionalformatting.odsbin0 -> 27042 bytes
-rw-r--r--source/media/files/scalc/bg/conditionalformatting.odsbin0 -> 27042 bytes
-rw-r--r--source/media/files/scalc/bn-IN/conditionalformatting.odsbin0 -> 27042 bytes
-rw-r--r--source/media/files/scalc/bn/conditionalformatting.odsbin0 -> 27042 bytes
-rw-r--r--source/media/files/scalc/bo/conditionalformatting.odsbin0 -> 27042 bytes
-rw-r--r--source/media/files/scalc/bs/conditionalformatting.odsbin0 -> 27042 bytes
-rw-r--r--source/media/files/scalc/ca-valencia/conditionalformatting.odsbin0 -> 27042 bytes
-rw-r--r--source/media/files/scalc/ca/conditionalformatting.odsbin0 -> 27042 bytes
-rw-r--r--source/media/files/scalc/conditionalformatting.odsbin0 -> 27042 bytes
-rw-r--r--source/media/files/scalc/cs/conditionalformatting.odsbin0 -> 27042 bytes
-rw-r--r--source/media/files/scalc/da/conditionalformatting.odsbin0 -> 27042 bytes
-rw-r--r--source/media/files/scalc/de/conditionalformatting.odsbin0 -> 27042 bytes
-rw-r--r--source/media/files/scalc/dz/conditionalformatting.odsbin0 -> 27042 bytes
-rw-r--r--source/media/files/scalc/el/conditionalformatting.odsbin0 -> 27042 bytes
-rw-r--r--source/media/files/scalc/en-GB/conditionalformatting.odsbin0 -> 27042 bytes
-rw-r--r--source/media/files/scalc/en-US/conditionalformatting.odsbin0 -> 27042 bytes
-rw-r--r--source/media/files/scalc/en-ZA/conditionalformatting.odsbin0 -> 27042 bytes
-rw-r--r--source/media/files/scalc/eo/conditionalformatting.odsbin0 -> 27042 bytes
-rw-r--r--source/media/files/scalc/es/conditionalformatting.odsbin0 -> 27042 bytes
-rw-r--r--source/media/files/scalc/et/conditionalformatting.odsbin0 -> 27042 bytes
-rw-r--r--source/media/files/scalc/eu/conditionalformatting.odsbin0 -> 27042 bytes
-rw-r--r--source/media/files/scalc/fi/conditionalformatting.odsbin0 -> 27042 bytes
-rw-r--r--source/media/files/scalc/fr/conditionalformatting.odsbin0 -> 27042 bytes
-rw-r--r--source/media/files/scalc/gl/conditionalformatting.odsbin0 -> 27042 bytes
-rw-r--r--source/media/files/scalc/gu/conditionalformatting.odsbin0 -> 27042 bytes
-rw-r--r--source/media/files/scalc/he/conditionalformatting.odsbin0 -> 27042 bytes
-rw-r--r--source/media/files/scalc/hi/conditionalformatting.odsbin0 -> 27042 bytes
-rw-r--r--source/media/files/scalc/hr/conditionalformatting.odsbin0 -> 27042 bytes
-rw-r--r--source/media/files/scalc/hu/conditionalformatting.odsbin0 -> 27042 bytes
-rw-r--r--source/media/files/scalc/id/conditionalformatting.odsbin0 -> 27042 bytes
-rw-r--r--source/media/files/scalc/is/conditionalformatting.odsbin0 -> 27042 bytes
-rw-r--r--source/media/files/scalc/it/conditionalformatting.odsbin0 -> 27042 bytes
-rw-r--r--source/media/files/scalc/ja/conditionalformatting.odsbin0 -> 27042 bytes
-rw-r--r--source/media/files/scalc/ka/conditionalformatting.odsbin0 -> 27042 bytes
-rw-r--r--source/media/files/scalc/km/conditionalformatting.odsbin0 -> 27042 bytes
-rw-r--r--source/media/files/scalc/ko/conditionalformatting.odsbin0 -> 27042 bytes
-rw-r--r--source/media/files/scalc/lo/conditionalformatting.odsbin0 -> 27042 bytes
-rw-r--r--source/media/files/scalc/lt/conditionalformatting.odsbin0 -> 27042 bytes
-rw-r--r--source/media/files/scalc/lv/conditionalformatting.odsbin0 -> 27042 bytes
-rw-r--r--source/media/files/scalc/mk/conditionalformatting.odsbin0 -> 27042 bytes
-rw-r--r--source/media/files/scalc/nb/conditionalformatting.odsbin0 -> 27042 bytes
-rw-r--r--source/media/files/scalc/ne/conditionalformatting.odsbin0 -> 27042 bytes
-rw-r--r--source/media/files/scalc/nl/conditionalformatting.odsbin0 -> 27042 bytes
-rw-r--r--source/media/files/scalc/nn/conditionalformatting.odsbin0 -> 27042 bytes
-rw-r--r--source/media/files/scalc/om/conditionalformatting.odsbin0 -> 27042 bytes
-rw-r--r--source/media/files/scalc/pl/conditionalformatting.odsbin0 -> 27042 bytes
-rw-r--r--source/media/files/scalc/pt-BR/conditionalformatting.odsbin0 -> 27042 bytes
-rw-r--r--source/media/files/scalc/pt/conditionalformatting.odsbin0 -> 27042 bytes
-rw-r--r--source/media/files/scalc/qtz/conditionalformatting.odsbin0 -> 27042 bytes
-rw-r--r--source/media/files/scalc/ro/conditionalformatting.odsbin0 -> 27042 bytes
-rw-r--r--source/media/files/scalc/ru/conditionalformatting.odsbin0 -> 27042 bytes
-rw-r--r--source/media/files/scalc/si/conditionalformatting.odsbin0 -> 27042 bytes
-rw-r--r--source/media/files/scalc/sid/conditionalformatting.odsbin0 -> 27042 bytes
-rw-r--r--source/media/files/scalc/sk/conditionalformatting.odsbin0 -> 27042 bytes
-rw-r--r--source/media/files/scalc/sl/conditionalformatting.odsbin0 -> 27042 bytes
-rw-r--r--source/media/files/scalc/sq/conditionalformatting.odsbin0 -> 27042 bytes
-rw-r--r--source/media/files/scalc/sv/conditionalformatting.odsbin0 -> 27042 bytes
-rw-r--r--source/media/files/scalc/ta/conditionalformatting.odsbin0 -> 27042 bytes
-rw-r--r--source/media/files/scalc/tg/conditionalformatting.odsbin0 -> 27042 bytes
-rw-r--r--source/media/files/scalc/tr/conditionalformatting.odsbin0 -> 27042 bytes
-rw-r--r--source/media/files/scalc/ug/conditionalformatting.odsbin0 -> 27042 bytes
-rw-r--r--source/media/files/scalc/uk/conditionalformatting.odsbin0 -> 27042 bytes
-rw-r--r--source/media/files/scalc/vi/conditionalformatting.odsbin0 -> 27042 bytes
-rw-r--r--source/media/files/scalc/zh-CN/conditionalformatting.odsbin0 -> 27042 bytes
-rw-r--r--source/media/files/scalc/zh-TW/conditionalformatting.odsbin0 -> 27042 bytes
-rw-r--r--source/text/sbasic/python/main0000.xhp8
-rw-r--r--source/text/sbasic/python/python_programming.xhp2
-rw-r--r--source/text/sbasic/shared/01030400.xhp16
-rw-r--r--source/text/sbasic/shared/03/sf_region.xhp35
-rw-r--r--source/text/sbasic/shared/03/sf_session.xhp4
-rw-r--r--source/text/sbasic/shared/03120102.xhp1
-rw-r--r--source/text/sbasic/shared/main0601.xhp12
-rw-r--r--source/text/scalc/00/00000405.xhp92
-rw-r--r--source/text/scalc/01/04060105.xhp10
-rw-r--r--source/text/scalc/01/05120000.xhp239
-rw-r--r--source/text/scalc/01/05120100.xhp317
-rw-r--r--source/text/scalc/01/05120200.xhp26
-rw-r--r--source/text/scalc/01/05120300.xhp51
-rw-r--r--source/text/scalc/01/05120400.xhp243
-rw-r--r--source/text/scalc/01/05120500.xhp36
-rw-r--r--source/text/scalc/01/cell_styles.xhp2
-rw-r--r--source/text/scalc/06/calcsamplefiles.xhp3
-rw-r--r--source/text/scalc/guide/value_with_name.xhp10
-rw-r--r--source/text/sdatabase/dabaadvpropdat.xhp2
-rw-r--r--source/text/sdatabase/dabawiz00.xhp1
-rw-r--r--source/text/shared/00/00000002.xhp2
-rw-r--r--source/text/shared/00/00000007.xhp8
-rw-r--r--source/text/shared/00/00000406.xhp10
-rw-r--r--source/text/shared/01/05020100.xhp2
-rw-r--r--source/text/shared/01/05030500.xhp47
-rw-r--r--source/text/shared/01/06140100.xhp8
-rw-r--r--source/text/shared/01/06140400.xhp51
-rw-r--r--source/text/shared/01/minimal_column_width.xhp2
-rw-r--r--source/text/shared/02/03130000.xhp8
-rw-r--r--source/text/shared/02/03140000.xhp8
-rw-r--r--source/text/shared/05/new_help.xhp3
-rw-r--r--source/text/shared/06/youtubevideos.xhp2
-rw-r--r--source/text/shared/guide/ctl.xhp2
-rw-r--r--source/text/shared/guide/start_parameters.xhp2
-rw-r--r--source/text/shared/optionen/01040200.xhp1
-rw-r--r--source/text/shared/optionen/01040600.xhp4
-rw-r--r--source/text/shared/optionen/01041000.xhp9
-rw-r--r--source/text/shared/optionen/01060300.xhp3
-rw-r--r--source/text/swriter/01/contentcontrol00.xhp44
-rw-r--r--source/text/swriter/01/contentcontrol01.xhp38
108 files changed, 1060 insertions, 306 deletions
diff --git a/source/auxiliary/scalc.tree b/source/auxiliary/scalc.tree
index 6106d91ab..04b1a7ba1 100644
--- a/source/auxiliary/scalc.tree
+++ b/source/auxiliary/scalc.tree
@@ -194,7 +194,7 @@
<topic id="sbasic/text/sbasic/guide/read_write_values.xhp">Reading and Writing values to Ranges</topic>
<topic id="sbasic/text/sbasic/guide/calc_borders.xhp">Formatting Borders in Calc with Macros</topic>
</node>
- <node id="0815" title="Miscellaneous">
+ <node id="0816" title="Miscellaneous">
<topic id="scalc/text/scalc/guide/auto_off.xhp">Deactivating Automatic Changes</topic>
<topic id="scalc/text/scalc/guide/consolidate.xhp">Consolidating Data</topic>
<topic id="scalc/text/scalc/guide/goalseek.xhp">Applying Goal Seek</topic>
diff --git a/source/media/files/scalc/am/conditionalformatting.ods b/source/media/files/scalc/am/conditionalformatting.ods
new file mode 100644
index 000000000..5df7aa8c6
--- /dev/null
+++ b/source/media/files/scalc/am/conditionalformatting.ods
Binary files differ
diff --git a/source/media/files/scalc/ar/conditionalformatting.ods b/source/media/files/scalc/ar/conditionalformatting.ods
new file mode 100644
index 000000000..5df7aa8c6
--- /dev/null
+++ b/source/media/files/scalc/ar/conditionalformatting.ods
Binary files differ
diff --git a/source/media/files/scalc/ast/conditionalformatting.ods b/source/media/files/scalc/ast/conditionalformatting.ods
new file mode 100644
index 000000000..5df7aa8c6
--- /dev/null
+++ b/source/media/files/scalc/ast/conditionalformatting.ods
Binary files differ
diff --git a/source/media/files/scalc/bg/conditionalformatting.ods b/source/media/files/scalc/bg/conditionalformatting.ods
new file mode 100644
index 000000000..5df7aa8c6
--- /dev/null
+++ b/source/media/files/scalc/bg/conditionalformatting.ods
Binary files differ
diff --git a/source/media/files/scalc/bn-IN/conditionalformatting.ods b/source/media/files/scalc/bn-IN/conditionalformatting.ods
new file mode 100644
index 000000000..5df7aa8c6
--- /dev/null
+++ b/source/media/files/scalc/bn-IN/conditionalformatting.ods
Binary files differ
diff --git a/source/media/files/scalc/bn/conditionalformatting.ods b/source/media/files/scalc/bn/conditionalformatting.ods
new file mode 100644
index 000000000..5df7aa8c6
--- /dev/null
+++ b/source/media/files/scalc/bn/conditionalformatting.ods
Binary files differ
diff --git a/source/media/files/scalc/bo/conditionalformatting.ods b/source/media/files/scalc/bo/conditionalformatting.ods
new file mode 100644
index 000000000..5df7aa8c6
--- /dev/null
+++ b/source/media/files/scalc/bo/conditionalformatting.ods
Binary files differ
diff --git a/source/media/files/scalc/bs/conditionalformatting.ods b/source/media/files/scalc/bs/conditionalformatting.ods
new file mode 100644
index 000000000..5df7aa8c6
--- /dev/null
+++ b/source/media/files/scalc/bs/conditionalformatting.ods
Binary files differ
diff --git a/source/media/files/scalc/ca-valencia/conditionalformatting.ods b/source/media/files/scalc/ca-valencia/conditionalformatting.ods
new file mode 100644
index 000000000..5df7aa8c6
--- /dev/null
+++ b/source/media/files/scalc/ca-valencia/conditionalformatting.ods
Binary files differ
diff --git a/source/media/files/scalc/ca/conditionalformatting.ods b/source/media/files/scalc/ca/conditionalformatting.ods
new file mode 100644
index 000000000..5df7aa8c6
--- /dev/null
+++ b/source/media/files/scalc/ca/conditionalformatting.ods
Binary files differ
diff --git a/source/media/files/scalc/conditionalformatting.ods b/source/media/files/scalc/conditionalformatting.ods
new file mode 100644
index 000000000..5df7aa8c6
--- /dev/null
+++ b/source/media/files/scalc/conditionalformatting.ods
Binary files differ
diff --git a/source/media/files/scalc/cs/conditionalformatting.ods b/source/media/files/scalc/cs/conditionalformatting.ods
new file mode 100644
index 000000000..5df7aa8c6
--- /dev/null
+++ b/source/media/files/scalc/cs/conditionalformatting.ods
Binary files differ
diff --git a/source/media/files/scalc/da/conditionalformatting.ods b/source/media/files/scalc/da/conditionalformatting.ods
new file mode 100644
index 000000000..5df7aa8c6
--- /dev/null
+++ b/source/media/files/scalc/da/conditionalformatting.ods
Binary files differ
diff --git a/source/media/files/scalc/de/conditionalformatting.ods b/source/media/files/scalc/de/conditionalformatting.ods
new file mode 100644
index 000000000..5df7aa8c6
--- /dev/null
+++ b/source/media/files/scalc/de/conditionalformatting.ods
Binary files differ
diff --git a/source/media/files/scalc/dz/conditionalformatting.ods b/source/media/files/scalc/dz/conditionalformatting.ods
new file mode 100644
index 000000000..5df7aa8c6
--- /dev/null
+++ b/source/media/files/scalc/dz/conditionalformatting.ods
Binary files differ
diff --git a/source/media/files/scalc/el/conditionalformatting.ods b/source/media/files/scalc/el/conditionalformatting.ods
new file mode 100644
index 000000000..5df7aa8c6
--- /dev/null
+++ b/source/media/files/scalc/el/conditionalformatting.ods
Binary files differ
diff --git a/source/media/files/scalc/en-GB/conditionalformatting.ods b/source/media/files/scalc/en-GB/conditionalformatting.ods
new file mode 100644
index 000000000..5df7aa8c6
--- /dev/null
+++ b/source/media/files/scalc/en-GB/conditionalformatting.ods
Binary files differ
diff --git a/source/media/files/scalc/en-US/conditionalformatting.ods b/source/media/files/scalc/en-US/conditionalformatting.ods
new file mode 100644
index 000000000..5df7aa8c6
--- /dev/null
+++ b/source/media/files/scalc/en-US/conditionalformatting.ods
Binary files differ
diff --git a/source/media/files/scalc/en-ZA/conditionalformatting.ods b/source/media/files/scalc/en-ZA/conditionalformatting.ods
new file mode 100644
index 000000000..5df7aa8c6
--- /dev/null
+++ b/source/media/files/scalc/en-ZA/conditionalformatting.ods
Binary files differ
diff --git a/source/media/files/scalc/eo/conditionalformatting.ods b/source/media/files/scalc/eo/conditionalformatting.ods
new file mode 100644
index 000000000..5df7aa8c6
--- /dev/null
+++ b/source/media/files/scalc/eo/conditionalformatting.ods
Binary files differ
diff --git a/source/media/files/scalc/es/conditionalformatting.ods b/source/media/files/scalc/es/conditionalformatting.ods
new file mode 100644
index 000000000..5df7aa8c6
--- /dev/null
+++ b/source/media/files/scalc/es/conditionalformatting.ods
Binary files differ
diff --git a/source/media/files/scalc/et/conditionalformatting.ods b/source/media/files/scalc/et/conditionalformatting.ods
new file mode 100644
index 000000000..5df7aa8c6
--- /dev/null
+++ b/source/media/files/scalc/et/conditionalformatting.ods
Binary files differ
diff --git a/source/media/files/scalc/eu/conditionalformatting.ods b/source/media/files/scalc/eu/conditionalformatting.ods
new file mode 100644
index 000000000..5df7aa8c6
--- /dev/null
+++ b/source/media/files/scalc/eu/conditionalformatting.ods
Binary files differ
diff --git a/source/media/files/scalc/fi/conditionalformatting.ods b/source/media/files/scalc/fi/conditionalformatting.ods
new file mode 100644
index 000000000..5df7aa8c6
--- /dev/null
+++ b/source/media/files/scalc/fi/conditionalformatting.ods
Binary files differ
diff --git a/source/media/files/scalc/fr/conditionalformatting.ods b/source/media/files/scalc/fr/conditionalformatting.ods
new file mode 100644
index 000000000..5df7aa8c6
--- /dev/null
+++ b/source/media/files/scalc/fr/conditionalformatting.ods
Binary files differ
diff --git a/source/media/files/scalc/gl/conditionalformatting.ods b/source/media/files/scalc/gl/conditionalformatting.ods
new file mode 100644
index 000000000..5df7aa8c6
--- /dev/null
+++ b/source/media/files/scalc/gl/conditionalformatting.ods
Binary files differ
diff --git a/source/media/files/scalc/gu/conditionalformatting.ods b/source/media/files/scalc/gu/conditionalformatting.ods
new file mode 100644
index 000000000..5df7aa8c6
--- /dev/null
+++ b/source/media/files/scalc/gu/conditionalformatting.ods
Binary files differ
diff --git a/source/media/files/scalc/he/conditionalformatting.ods b/source/media/files/scalc/he/conditionalformatting.ods
new file mode 100644
index 000000000..5df7aa8c6
--- /dev/null
+++ b/source/media/files/scalc/he/conditionalformatting.ods
Binary files differ
diff --git a/source/media/files/scalc/hi/conditionalformatting.ods b/source/media/files/scalc/hi/conditionalformatting.ods
new file mode 100644
index 000000000..5df7aa8c6
--- /dev/null
+++ b/source/media/files/scalc/hi/conditionalformatting.ods
Binary files differ
diff --git a/source/media/files/scalc/hr/conditionalformatting.ods b/source/media/files/scalc/hr/conditionalformatting.ods
new file mode 100644
index 000000000..5df7aa8c6
--- /dev/null
+++ b/source/media/files/scalc/hr/conditionalformatting.ods
Binary files differ
diff --git a/source/media/files/scalc/hu/conditionalformatting.ods b/source/media/files/scalc/hu/conditionalformatting.ods
new file mode 100644
index 000000000..5df7aa8c6
--- /dev/null
+++ b/source/media/files/scalc/hu/conditionalformatting.ods
Binary files differ
diff --git a/source/media/files/scalc/id/conditionalformatting.ods b/source/media/files/scalc/id/conditionalformatting.ods
new file mode 100644
index 000000000..5df7aa8c6
--- /dev/null
+++ b/source/media/files/scalc/id/conditionalformatting.ods
Binary files differ
diff --git a/source/media/files/scalc/is/conditionalformatting.ods b/source/media/files/scalc/is/conditionalformatting.ods
new file mode 100644
index 000000000..5df7aa8c6
--- /dev/null
+++ b/source/media/files/scalc/is/conditionalformatting.ods
Binary files differ
diff --git a/source/media/files/scalc/it/conditionalformatting.ods b/source/media/files/scalc/it/conditionalformatting.ods
new file mode 100644
index 000000000..5df7aa8c6
--- /dev/null
+++ b/source/media/files/scalc/it/conditionalformatting.ods
Binary files differ
diff --git a/source/media/files/scalc/ja/conditionalformatting.ods b/source/media/files/scalc/ja/conditionalformatting.ods
new file mode 100644
index 000000000..5df7aa8c6
--- /dev/null
+++ b/source/media/files/scalc/ja/conditionalformatting.ods
Binary files differ
diff --git a/source/media/files/scalc/ka/conditionalformatting.ods b/source/media/files/scalc/ka/conditionalformatting.ods
new file mode 100644
index 000000000..5df7aa8c6
--- /dev/null
+++ b/source/media/files/scalc/ka/conditionalformatting.ods
Binary files differ
diff --git a/source/media/files/scalc/km/conditionalformatting.ods b/source/media/files/scalc/km/conditionalformatting.ods
new file mode 100644
index 000000000..5df7aa8c6
--- /dev/null
+++ b/source/media/files/scalc/km/conditionalformatting.ods
Binary files differ
diff --git a/source/media/files/scalc/ko/conditionalformatting.ods b/source/media/files/scalc/ko/conditionalformatting.ods
new file mode 100644
index 000000000..5df7aa8c6
--- /dev/null
+++ b/source/media/files/scalc/ko/conditionalformatting.ods
Binary files differ
diff --git a/source/media/files/scalc/lo/conditionalformatting.ods b/source/media/files/scalc/lo/conditionalformatting.ods
new file mode 100644
index 000000000..5df7aa8c6
--- /dev/null
+++ b/source/media/files/scalc/lo/conditionalformatting.ods
Binary files differ
diff --git a/source/media/files/scalc/lt/conditionalformatting.ods b/source/media/files/scalc/lt/conditionalformatting.ods
new file mode 100644
index 000000000..5df7aa8c6
--- /dev/null
+++ b/source/media/files/scalc/lt/conditionalformatting.ods
Binary files differ
diff --git a/source/media/files/scalc/lv/conditionalformatting.ods b/source/media/files/scalc/lv/conditionalformatting.ods
new file mode 100644
index 000000000..5df7aa8c6
--- /dev/null
+++ b/source/media/files/scalc/lv/conditionalformatting.ods
Binary files differ
diff --git a/source/media/files/scalc/mk/conditionalformatting.ods b/source/media/files/scalc/mk/conditionalformatting.ods
new file mode 100644
index 000000000..5df7aa8c6
--- /dev/null
+++ b/source/media/files/scalc/mk/conditionalformatting.ods
Binary files differ
diff --git a/source/media/files/scalc/nb/conditionalformatting.ods b/source/media/files/scalc/nb/conditionalformatting.ods
new file mode 100644
index 000000000..5df7aa8c6
--- /dev/null
+++ b/source/media/files/scalc/nb/conditionalformatting.ods
Binary files differ
diff --git a/source/media/files/scalc/ne/conditionalformatting.ods b/source/media/files/scalc/ne/conditionalformatting.ods
new file mode 100644
index 000000000..5df7aa8c6
--- /dev/null
+++ b/source/media/files/scalc/ne/conditionalformatting.ods
Binary files differ
diff --git a/source/media/files/scalc/nl/conditionalformatting.ods b/source/media/files/scalc/nl/conditionalformatting.ods
new file mode 100644
index 000000000..5df7aa8c6
--- /dev/null
+++ b/source/media/files/scalc/nl/conditionalformatting.ods
Binary files differ
diff --git a/source/media/files/scalc/nn/conditionalformatting.ods b/source/media/files/scalc/nn/conditionalformatting.ods
new file mode 100644
index 000000000..5df7aa8c6
--- /dev/null
+++ b/source/media/files/scalc/nn/conditionalformatting.ods
Binary files differ
diff --git a/source/media/files/scalc/om/conditionalformatting.ods b/source/media/files/scalc/om/conditionalformatting.ods
new file mode 100644
index 000000000..5df7aa8c6
--- /dev/null
+++ b/source/media/files/scalc/om/conditionalformatting.ods
Binary files differ
diff --git a/source/media/files/scalc/pl/conditionalformatting.ods b/source/media/files/scalc/pl/conditionalformatting.ods
new file mode 100644
index 000000000..5df7aa8c6
--- /dev/null
+++ b/source/media/files/scalc/pl/conditionalformatting.ods
Binary files differ
diff --git a/source/media/files/scalc/pt-BR/conditionalformatting.ods b/source/media/files/scalc/pt-BR/conditionalformatting.ods
new file mode 100644
index 000000000..5df7aa8c6
--- /dev/null
+++ b/source/media/files/scalc/pt-BR/conditionalformatting.ods
Binary files differ
diff --git a/source/media/files/scalc/pt/conditionalformatting.ods b/source/media/files/scalc/pt/conditionalformatting.ods
new file mode 100644
index 000000000..5df7aa8c6
--- /dev/null
+++ b/source/media/files/scalc/pt/conditionalformatting.ods
Binary files differ
diff --git a/source/media/files/scalc/qtz/conditionalformatting.ods b/source/media/files/scalc/qtz/conditionalformatting.ods
new file mode 100644
index 000000000..5df7aa8c6
--- /dev/null
+++ b/source/media/files/scalc/qtz/conditionalformatting.ods
Binary files differ
diff --git a/source/media/files/scalc/ro/conditionalformatting.ods b/source/media/files/scalc/ro/conditionalformatting.ods
new file mode 100644
index 000000000..5df7aa8c6
--- /dev/null
+++ b/source/media/files/scalc/ro/conditionalformatting.ods
Binary files differ
diff --git a/source/media/files/scalc/ru/conditionalformatting.ods b/source/media/files/scalc/ru/conditionalformatting.ods
new file mode 100644
index 000000000..5df7aa8c6
--- /dev/null
+++ b/source/media/files/scalc/ru/conditionalformatting.ods
Binary files differ
diff --git a/source/media/files/scalc/si/conditionalformatting.ods b/source/media/files/scalc/si/conditionalformatting.ods
new file mode 100644
index 000000000..5df7aa8c6
--- /dev/null
+++ b/source/media/files/scalc/si/conditionalformatting.ods
Binary files differ
diff --git a/source/media/files/scalc/sid/conditionalformatting.ods b/source/media/files/scalc/sid/conditionalformatting.ods
new file mode 100644
index 000000000..5df7aa8c6
--- /dev/null
+++ b/source/media/files/scalc/sid/conditionalformatting.ods
Binary files differ
diff --git a/source/media/files/scalc/sk/conditionalformatting.ods b/source/media/files/scalc/sk/conditionalformatting.ods
new file mode 100644
index 000000000..5df7aa8c6
--- /dev/null
+++ b/source/media/files/scalc/sk/conditionalformatting.ods
Binary files differ
diff --git a/source/media/files/scalc/sl/conditionalformatting.ods b/source/media/files/scalc/sl/conditionalformatting.ods
new file mode 100644
index 000000000..5df7aa8c6
--- /dev/null
+++ b/source/media/files/scalc/sl/conditionalformatting.ods
Binary files differ
diff --git a/source/media/files/scalc/sq/conditionalformatting.ods b/source/media/files/scalc/sq/conditionalformatting.ods
new file mode 100644
index 000000000..5df7aa8c6
--- /dev/null
+++ b/source/media/files/scalc/sq/conditionalformatting.ods
Binary files differ
diff --git a/source/media/files/scalc/sv/conditionalformatting.ods b/source/media/files/scalc/sv/conditionalformatting.ods
new file mode 100644
index 000000000..5df7aa8c6
--- /dev/null
+++ b/source/media/files/scalc/sv/conditionalformatting.ods
Binary files differ
diff --git a/source/media/files/scalc/ta/conditionalformatting.ods b/source/media/files/scalc/ta/conditionalformatting.ods
new file mode 100644
index 000000000..5df7aa8c6
--- /dev/null
+++ b/source/media/files/scalc/ta/conditionalformatting.ods
Binary files differ
diff --git a/source/media/files/scalc/tg/conditionalformatting.ods b/source/media/files/scalc/tg/conditionalformatting.ods
new file mode 100644
index 000000000..5df7aa8c6
--- /dev/null
+++ b/source/media/files/scalc/tg/conditionalformatting.ods
Binary files differ
diff --git a/source/media/files/scalc/tr/conditionalformatting.ods b/source/media/files/scalc/tr/conditionalformatting.ods
new file mode 100644
index 000000000..5df7aa8c6
--- /dev/null
+++ b/source/media/files/scalc/tr/conditionalformatting.ods
Binary files differ
diff --git a/source/media/files/scalc/ug/conditionalformatting.ods b/source/media/files/scalc/ug/conditionalformatting.ods
new file mode 100644
index 000000000..5df7aa8c6
--- /dev/null
+++ b/source/media/files/scalc/ug/conditionalformatting.ods
Binary files differ
diff --git a/source/media/files/scalc/uk/conditionalformatting.ods b/source/media/files/scalc/uk/conditionalformatting.ods
new file mode 100644
index 000000000..5df7aa8c6
--- /dev/null
+++ b/source/media/files/scalc/uk/conditionalformatting.ods
Binary files differ
diff --git a/source/media/files/scalc/vi/conditionalformatting.ods b/source/media/files/scalc/vi/conditionalformatting.ods
new file mode 100644
index 000000000..5df7aa8c6
--- /dev/null
+++ b/source/media/files/scalc/vi/conditionalformatting.ods
Binary files differ
diff --git a/source/media/files/scalc/zh-CN/conditionalformatting.ods b/source/media/files/scalc/zh-CN/conditionalformatting.ods
new file mode 100644
index 000000000..5df7aa8c6
--- /dev/null
+++ b/source/media/files/scalc/zh-CN/conditionalformatting.ods
Binary files differ
diff --git a/source/media/files/scalc/zh-TW/conditionalformatting.ods b/source/media/files/scalc/zh-TW/conditionalformatting.ods
new file mode 100644
index 000000000..5df7aa8c6
--- /dev/null
+++ b/source/media/files/scalc/zh-TW/conditionalformatting.ods
Binary files differ
diff --git a/source/text/sbasic/python/main0000.xhp b/source/text/sbasic/python/main0000.xhp
index fe47d7502..40aaa194e 100644
--- a/source/text/sbasic/python/main0000.xhp
+++ b/source/text/sbasic/python/main0000.xhp
@@ -34,16 +34,22 @@
</case>
</switch>
<embed href="text/shared/guide/scripting.xhp#scripting"/>
+ <section id="pyContent">
<embed href="text/sbasic/python/python_ide.xhp#pythonideh1"/>
<embed href="text/sbasic/python/python_locations.xhp#pythonlocations1"/>
<embed href="text/sbasic/python/python_shell.xhp#pythonshell1"/>
<embed href="text/sbasic/python/python_programming.xhp#pythonprogrammingheading"/>
<embed href="text/sbasic/python/python_examples.xhp#pythonexamples2"/>
+ <embed href="text/sbasic/python/python_2_basic.xhp#py2ba_h1"/>
<embed href="text/sbasic/shared/03/sf_intro.xhp#title"/>
+ </section>
+ <section id="pyModules">
<h2 id="hd_id901655365903313">%PRODUCTNAME Python Modules</h2>
- <paragraph role="paragraph" id="par_id801655368030968"><link href="text/sbasic/shared/03/lib_ScriptForge.xhp" name="CHANGE ME"><literal>scriptforge</literal> module</link></paragraph>
<paragraph role="paragraph" id="par_id21655367848705"><link href="text/sbasic/python/python_screen.xhp" name="msgbox module"><literal>msgbox</literal> module</link></paragraph>
+ <paragraph role="paragraph" id="par_id801655368030968"><link href="text/sbasic/shared/03/lib_ScriptForge.xhp" name="scriptforge module"><literal>scriptforge</literal> module</link></paragraph>
+ <paragraph role="paragraph" id="par_id12655637848750"><link href="text/sbasic/python/python_programming.xhp#uno" name="uno module"><literal>uno</literal> module</link></paragraph>
+ </section>
<embed href="text/swriter/main0000.xhp#helpabouthelp"/>
</body>
diff --git a/source/text/sbasic/python/python_programming.xhp b/source/text/sbasic/python/python_programming.xhp
index 9f53dfa60..f70148d68 100644
--- a/source/text/sbasic/python/python_programming.xhp
+++ b/source/text/sbasic/python/python_programming.xhp
@@ -84,6 +84,7 @@
<section id="PythonFileSystemImport" >
<paragraph role="paragraph" id="N0241">%PRODUCTNAME Basic libraries contain classes, routines and variables, Python modules contain classes, functions and variables. Common pieces of reusable Python or UNO features must be stored in <link href="text/sbasic/python/python_locations.xhp" name="My macros">My macros</link> within <literal>(User Profile)/Scripts/python/pythonpath</literal>. Python libraries help organize modules in order to prevent module name collisions. Import <literal>uno.py</literal> inside shared modules.</paragraph>
</section>
+ <section id="uno">
<paragraph role="paragraph" id="N0242">Genuine BASIC UNO facilities can be inferred using <literal>uno.py</literal> module. Use <link href="text/sbasic/python/python_shell.xhp" name="Python interactive shell">Python interactive shell</link> to get a complete module description using <literal>dir()</literal> and <literal>help()</literal> Python commands.</paragraph>
<bookmark xml-lang="en-US" branch="index" id="bm_id391659034206678">
<bookmark_value>uno.py</bookmark_value>
@@ -196,6 +197,7 @@
</tablecell>
</tablerow>
</table>
+ </section>
<paragraph role="paragraph" id="N0272"><emph>LibreLogo</emph> and <emph>TableSample</emph> installation shared scripts use <literal>uno.py</literal> module.</paragraph>
<h2 id="N0273">More Python-Basic samples</h2>
<table id="N0274">
diff --git a/source/text/sbasic/shared/01030400.xhp b/source/text/sbasic/shared/01030400.xhp
index 71a53f428..5ac8afe43 100644
--- a/source/text/sbasic/shared/01030400.xhp
+++ b/source/text/sbasic/shared/01030400.xhp
@@ -57,7 +57,7 @@
<h3 id="hd_id3125864">Creating a New Library</h3>
<list type="ordered">
<listitem>
-<paragraph role="listitem" id="par_id3152576" xml-lang="en-US">Choose <emph>Tools - Macros - Organize Macros - %PRODUCTNAME Basic</emph> and click <emph>Organizer</emph> or click the <emph>Select Module</emph> icon in the Basic IDE to open the <emph>Macro Organizer</emph> dialog.</paragraph>
+<paragraph role="listitem" id="par_id3152576" xml-lang="en-US">Choose <emph>Tools - Macros - Organize Macros - Basic</emph> and click <emph>Organizer</emph> or click the <emph>Select Module</emph> icon in the Basic IDE to open the <emph>Macro Organizer</emph> dialog.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3153726" xml-lang="en-US">Click the <emph>Libraries</emph> tab.</paragraph>
@@ -72,7 +72,7 @@
<h3 id="hd_id3147394">Import a Library</h3>
<list type="ordered">
<listitem>
-<paragraph role="listitem" id="par_id3153157" xml-lang="en-US">Choose <emph>Tools - Macros - Organize Macros - %PRODUCTNAME Basic</emph> and click <emph>Organizer</emph> or click the <emph>Select Module</emph> icon in the Basic IDE to open the <emph>Macro Organizer</emph> dialog.</paragraph>
+<paragraph role="listitem" id="par_id3153157" xml-lang="en-US">Choose <emph>Tools - Macros - Organize Macros - Basic</emph> and click <emph>Organizer</emph> or click the <emph>Select Module</emph> icon in the Basic IDE to open the <emph>Macro Organizer</emph> dialog.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3146972" xml-lang="en-US">Click the <emph>Libraries</emph> tab.</paragraph>
@@ -99,7 +99,7 @@
<h3 id="hd_id3159099">Export a Library</h3>
<list type="ordered">
<listitem>
-<paragraph role="listitem" id="par_id3147005" xml-lang="en-US">Choose <emph>Tools - Macros - Organize Macros - %PRODUCTNAME Basic</emph> and click <emph>Organizer</emph> or click the <emph>Select Module</emph> icon in the Basic IDE to open the <emph>Macro Organizer</emph> dialog.</paragraph>
+<paragraph role="listitem" id="par_id3147005" xml-lang="en-US">Choose <emph>Tools - Macros - Organize Macros - Basic</emph> and click <emph>Organizer</emph> or click the <emph>Select Module</emph> icon in the Basic IDE to open the <emph>Macro Organizer</emph> dialog.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3147006" xml-lang="en-US">Click the <emph>Libraries</emph> tab.</paragraph>
@@ -126,7 +126,7 @@
<h3 id="hd_id3159100">Deleting a Library</h3>
<list type="ordered">
<listitem>
-<paragraph role="listitem" id="par_id3150086" xml-lang="en-US">Choose <emph>Tools - Macros - Organize Macros - %PRODUCTNAME Basic</emph> and click <emph>Organizer</emph> or click the <emph>Select Module</emph> icon in the Basic IDE to open the <emph>Macro Organizer</emph> dialog.</paragraph>
+<paragraph role="listitem" id="par_id3150086" xml-lang="en-US">Choose <emph>Tools - Macros - Organize Macros - Basic</emph> and click <emph>Organizer</emph> or click the <emph>Select Module</emph> icon in the Basic IDE to open the <emph>Macro Organizer</emph> dialog.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3146808" xml-lang="en-US">Click the <emph>Libraries</emph> tab.</paragraph>
@@ -153,7 +153,7 @@
<h3 id="hd_id3155265">Creating a New Module or Dialog</h3>
<list type="ordered">
<listitem>
-<paragraph role="listitem" id="par_id3154537" xml-lang="en-US">Choose <emph>Tools - Macros - Organize Macros - %PRODUCTNAME Basic</emph> and click <emph>Organizer</emph> or click the <emph>Select Module</emph> icon in the Basic IDE to open the <emph>Macro Organizer</emph> dialog.</paragraph>
+<paragraph role="listitem" id="par_id3154537" xml-lang="en-US">Choose <emph>Tools - Macros - Organize Macros - Basic</emph> and click <emph>Organizer</emph> or click the <emph>Select Module</emph> icon in the Basic IDE to open the <emph>Macro Organizer</emph> dialog.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3146781" xml-lang="en-US">Click the <emph>Modules</emph> tab or the <emph>Dialogs</emph> tab.</paragraph>
@@ -168,7 +168,7 @@
<h3 id="hd_id3152872">Renaming a Module or Dialog</h3>
<list type="ordered">
<listitem>
-<paragraph role="listitem" id="par_id3159230" xml-lang="en-US">Choose <emph>Tools - Macros - Organize Macros - %PRODUCTNAME Basic</emph> and click <emph>Organizer</emph> or click the <emph>Select Module</emph> icon in the Basic IDE to open the <emph>Macro Organizer</emph> dialog.</paragraph>
+<paragraph role="listitem" id="par_id3159230" xml-lang="en-US">Choose <emph>Tools - Macros - Organize Macros - Basic</emph> and click <emph>Organizer</emph> or click the <emph>Select Module</emph> icon in the Basic IDE to open the <emph>Macro Organizer</emph> dialog.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3150046" xml-lang="en-US">Click the module to be renamed twice, with a pause between the clicks. Enter the new name.</paragraph>
@@ -181,7 +181,7 @@
<h3 id="hd_id3146963">Deleting a Module or Dialog</h3>
<list type="ordered">
<listitem>
-<paragraph role="listitem" id="par_id3147547" xml-lang="en-US">Choose <emph>Tools - Macros - Organize Macros - %PRODUCTNAME Basic</emph> and click <emph>Organizer</emph> or click the <emph>Select Module</emph> icon in the Basic IDE to open the <emph>Macro Organizer</emph> dialog.</paragraph>
+<paragraph role="listitem" id="par_id3147547" xml-lang="en-US">Choose <emph>Tools - Macros - Organize Macros - Basic</emph> and click <emph>Organizer</emph> or click the <emph>Select Module</emph> icon in the Basic IDE to open the <emph>Macro Organizer</emph> dialog.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3150958" xml-lang="en-US">Click the <emph>Modules</emph> tab or the <emph>Dialogs</emph> tab.</paragraph>
@@ -201,7 +201,7 @@
<paragraph role="listitem" id="par_id3146819" xml-lang="en-US">Open all documents or templates among which you want to move or copy the modules or dialogs.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3149319" xml-lang="en-US">Choose <emph>Tools - Macros - Organize Macros - %PRODUCTNAME Basic</emph> and click <emph>Organizer</emph> or click the <emph>Select Module</emph> icon in the Basic IDE to open the <emph>Macro Organizer</emph> dialog.</paragraph>
+<paragraph role="listitem" id="par_id3149319" xml-lang="en-US">Choose <emph>Tools - Macros - Organize Macros - Basic</emph> and click <emph>Organizer</emph> or click the <emph>Select Module</emph> icon in the Basic IDE to open the <emph>Macro Organizer</emph> dialog.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3145637" xml-lang="en-US">To move a module or dialog to another document, click the corresponding object in the list and drag it to the desired position. A horizontal line indicates the target position of the current object while dragging. Hold the <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline> key while dragging to copy the object instead of moving it.</paragraph>
diff --git a/source/text/sbasic/shared/03/sf_region.xhp b/source/text/sbasic/shared/03/sf_region.xhp
index 2fee97f17..df0aec3b3 100644
--- a/source/text/sbasic/shared/03/sf_region.xhp
+++ b/source/text/sbasic/shared/03/sf_region.xhp
@@ -493,20 +493,31 @@
<paragraph role="pycode" id="pyc_id951656027482096">numText = oRegion.Number2Text("EUR 25.10", "en-US")</paragraph>
<paragraph role="pycode" id="pyc_id231656027482425">numText = oRegion.Number2Text("ordinal 15", "en-US")</paragraph>
</pycode>
- <paragraph role="paragraph" id="par_id801656027524051">To get a list of all supported prefixes in a given language, call <literal>Number2Text</literal> with the special "help" argument, as shown in the example below:</paragraph>
+ <paragraph role="paragraph" id="par_id801656027524051">To get a list of all supported prefixes in a given language, call <literal>Number2Text</literal> with the special "help" argument. In the example below, assume your locale is set to "en-US", then the list of available prefixes for "en-US" will be shown by <literal>MsgBox</literal>:</paragraph>
<bascode>
<paragraph role="bascode" localize="false" id="bas_id851656027713735">prefixes = oRegion.Number2Text("help")</paragraph>
<paragraph role="bascode" localize="false" id="bas_id716560277139601">MsgBox prefixes</paragraph>
- <paragraph role="bascode" id="bas_id181656027807107">' Considering the "en-US" locale the message box will show the following text</paragraph>
- <paragraph role="bascode" id="bas_id216560277123601">' one, two, three</paragraph>
- <paragraph role="bascode" id="bas_id361656027712711">' ordinal: first, second, third</paragraph>
- <paragraph role="bascode" id="bas_id891656027712920">' ordinal-number: 1st, 2nd, 3rd</paragraph>
- <paragraph role="bascode" id="bas_id611656027713104">' year: nineteen ninety-nine, two thousand, two thousand one</paragraph>
- <paragraph role="bascode" id="bas_id861656027713288">' currency (for example, USD): two U.S. dollars and fifty cents</paragraph>
- <paragraph role="bascode" id="bas_id841656027713503">' money USD: two and 50/100 U.S. dollars</paragraph>
+ <paragraph role="bascode" localize="false" id="bas_id216560277123601">' one, two, three</paragraph>
+ <paragraph role="bascode" localize="false" id="bas_id361656027712711">' ordinal: first, second, third</paragraph>
+ <paragraph role="bascode" localize="false" id="bas_id891656027712920">' ordinal-number: 1st, 2nd, 3rd</paragraph>
+ <paragraph role="bascode" localize="false" id="bas_id611656027713104">' year: nineteen ninety-nine, two thousand, two thousand one</paragraph>
+ <paragraph role="bascode" localize="false" id="bas_id861656027713288">' currency (for example, USD): two U.S. dollars and fifty cents</paragraph>
+ <paragraph role="bascode" localize="false" id="bas_id841656027713503">' money USD: two and 50/100 U.S. dollars</paragraph>
</bascode>
<paragraph role="paragraph" id="par_id781656027840633">The first line in the message box does not have a prefix, which means that it is the standard format. The subsequent lines include the prefix and some examples of numbers using its format.</paragraph>
- <note id="par_id781656028528520">Each language has its own set of supported prefixes.</note>
+ <note id="par_id781656028528520">Each language has its own set of supported prefixes. The number of available prefixes may vary from language to language.</note>
+ <paragraph role="paragraph" id="par_id531663849363398">To get the list of prefixes for a specific language or locale, it can be specified as the second argument in <literal>Number2Text</literal>. The example below shows the available prefixes available for the "pt-BR" locale:</paragraph>
+ <bascode>
+ <paragraph role="bascode" localize="false" id="bas_id301663849799013">prefixes = oRegion.Number2Text("help", "pt-BR")</paragraph>
+ <paragraph role="bascode" localize="false" id="bas_id801663849799462">MsgBox prefixes</paragraph>
+ <paragraph role="bascode" localize="false" id="bas_id931663849708619">' um, dois, três</paragraph>
+ <paragraph role="bascode" localize="false" id="bas_id416638497808923">' feminine: uma, duas, três</paragraph>
+ <paragraph role="bascode" localize="false" id="bas_id371663849709114">' masculine: um, dois, três</paragraph>
+ <paragraph role="bascode" localize="false" id="bas_id701663849709307">' ordinal-feminine: primeira, segunda, terceira</paragraph>
+ <paragraph role="bascode" localize="false" id="bas_id411663849709530">' ordinal-masculine: primeiro, segundo, terceiro</paragraph>
+ <paragraph role="bascode" localize="false" id="bas_id611663849709803">' ordinal-number-feminine: 1.ª, 2.ª, 3.ª</paragraph>
+ <paragraph role="bascode" localize="false" id="bas_id831663849710011">' ordinal-number-masculine: 1.º, 2.º, 3.º</paragraph>
+ </bascode>
</section>
<section id="TimeZoneOffset">
@@ -563,9 +574,9 @@
</bascode>
<embed href="text/sbasic/shared/00000003.xhp#In_Python"/>
<pycode>
- <paragraph role="pycode" id="pyc_id361656077667354">import datetime</paragraph>
- <paragraph role="pycode" id="pyc_id901656077667666">localDT = datetime.datetime(2022, 6, 23, 14, 30, 0)</paragraph>
- <paragraph role="pycode" id="pyc_id521656077682826">utcTime = oRegion.UTCDateTime(localDT, "Europe/Berlin", "DE")</paragraph>
+ <paragraph role="pycode" localize="false" id="pyc_id361656077667354">import datetime</paragraph>
+ <paragraph role="pycode" localize="false" id="pyc_id901656077667666">localDT = datetime.datetime(2022, 6, 23, 14, 30, 0)</paragraph>
+ <paragraph role="pycode" localize="false" id="pyc_id521656077682826">utcTime = oRegion.UTCDateTime(localDT, "Europe/Berlin", "DE")</paragraph>
</pycode>
</section>
diff --git a/source/text/sbasic/shared/03/sf_session.xhp b/source/text/sbasic/shared/03/sf_session.xhp
index ff4124323..477445ea6 100644
--- a/source/text/sbasic/shared/03/sf_session.xhp
+++ b/source/text/sbasic/shared/03/sf_session.xhp
@@ -104,7 +104,7 @@
<paragraph id="par_id4158281472033" role="tablecontent" xml-lang="en-US" localize="false">"user"</paragraph>
</tablecell>
<tablecell>
- <paragraph id="par_id391582814720487" role="tablecontent" xml-lang="en-US">in My Macros</paragraph>
+ <paragraph id="par_id391582814720487" role="tablecontent" xml-lang="en-US">in <emph>My Macros</emph></paragraph>
</tablecell>
<tablecell>
<paragraph id="par_id701582814720517" role="tablecontent" xml-lang="en-US" localize="false">Python</paragraph>
@@ -132,7 +132,7 @@
<paragraph id="par_id991582814720953" role="tablecontent" xml-lang="en-US" localize="false">"share"</paragraph>
</tablecell>
<tablecell>
- <paragraph id="par_id21582814720997" role="tablecontent" xml-lang="en-US">in %PRODUCTNAME macros</paragraph>
+ <paragraph id="par_id21582814720997" role="tablecontent" xml-lang="en-US">in <emph>Application Macros</emph></paragraph>
</tablecell>
<tablecell>
<paragraph id="par_id491582814720794" role="tablecontent" xml-lang="en-US" localize="false">Python</paragraph>
diff --git a/source/text/sbasic/shared/03120102.xhp b/source/text/sbasic/shared/03120102.xhp
index e0329d570..2f41ee9c8 100644
--- a/source/text/sbasic/shared/03120102.xhp
+++ b/source/text/sbasic/shared/03120102.xhp
@@ -61,7 +61,6 @@
<paragraph id="par_id3145174" role="bascode" xml-lang="en-US"> ' The printout appears in the dialog as: A "short" trip.</paragraph>
<paragraph role="bascode" id="bas_id481642668824226" xml-lang="en-US"> MsgBox Chr(charcode := 64) ' "@" sign</paragraph>
<paragraph id="par_idm1341131568" role="bascode" localize="false">End Sub</paragraph>
- <paragraph role="bascode" id="bas_id661642668825250"></paragraph>
</bascode>
<section id="relatedtopics">
diff --git a/source/text/sbasic/shared/main0601.xhp b/source/text/sbasic/shared/main0601.xhp
index 569773563..523061c6f 100644
--- a/source/text/sbasic/shared/main0601.xhp
+++ b/source/text/sbasic/shared/main0601.xhp
@@ -52,15 +52,13 @@
<embed href="text/sbasic/shared/special_vba_func.xhp#exclusivevba"/>
<h3 id="hd_id191548155077269">Working with Macros in Python</h3>
+
<embed href="text/sbasic/python/main0000.xhp#pythonscriptshelp"/>
-<embed href="text/sbasic/python/python_ide.xhp#pythonideh1"/>
-<embed href="text/sbasic/python/python_locations.xhp#pythonlocations1"/>
-<embed href="text/sbasic/python/python_shell.xhp#pythonshell1"/>
-<embed href="text/sbasic/python/python_programming.xhp#pythonprogrammingheading"/>
-<embed href="text/sbasic/python/python_examples.xhp#pythonexamples2"/>
-<embed href="text/sbasic/python/python_2_basic.xhp#py2ba_h1"/>
+<embed href="text/sbasic/python/main0000.xhp#pyContent"/>
-<paragraph role="heading" id="hd_id51528998827009" level="3" xml-lang="en-US">%PRODUCTNAME internal Basic macro libraries</paragraph>
+<embed href="text/sbasic/python/main0000.xhp#pyModules"/>
+
+<h3 id="hd_id51528998827009" xml-lang="en-US">%PRODUCTNAME internal Basic macro libraries</h3>
<paragraph role="paragraph" id="par_id441528998842556" xml-lang="en-US">%PRODUCTNAME installs a set of Basic macro libraries that can be accessed from your Basic macros.</paragraph>
<embed href="text/sbasic/shared/03/lib_tools.xhp#tools_lib"/>
<embed href="text/sbasic/shared/03/lib_depot.xhp#depot_lib"/>
diff --git a/source/text/scalc/00/00000405.xhp b/source/text/scalc/00/00000405.xhp
index 13ee92fbe..35a935020 100644
--- a/source/text/scalc/00/00000405.xhp
+++ b/source/text/scalc/00/00000405.xhp
@@ -60,6 +60,97 @@
<paragraph role="paragraph" id="par_id3156290" xml-lang="en-US"><variable id="fodrhin">Choose <emph>Format - Print Ranges - Add</emph>.</variable></paragraph>
<paragraph role="paragraph" id="par_id3155812" xml-lang="en-US"><variable id="fodbah">Choose <emph>Format - Print Ranges - Clear</emph>.</variable></paragraph>
<paragraph role="paragraph" id="par_id3153307" xml-lang="en-US"><variable id="fodbbe">Choose <emph>Format - Print Ranges - Edit</emph>.</variable></paragraph>
+
+
+<section id="s_conditionalcondition">
+ <paragraph role="paragraph" id="par_id3154618" xml-lang="en-US"><variable id="bedingte">Choose <menuitem>Format - Conditional - Condition</menuitem>.</variable></paragraph>
+ <paragraph role="paragraph" id="par_id141663543112100">On the <emph>Formatting</emph> bar, click</paragraph>
+ <table id="tab_id771663540244129">
+ <tablerow>
+ <tablecell>
+ <paragraph id="par_id1001663540244130" role="paragraph">
+ <image src="cmd/lc_conditionalformatdialog.svg" id="img_id461663540244131" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id201663540244132">Icon Conditional Format - Condition</alt></image>
+ </paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id151663540244134" role="paragraph" xml-lang="en-US">Conditional Format</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
+</section>
+
+<section id="s_conditionalcolorscale">
+ <paragraph role="paragraph" id="par_id31663542115011"><variable id="conditionalcolorscale">Choose <menuitem>Format - Conditional - Color Scale</menuitem></variable></paragraph>
+ <paragraph role="paragraph" id="par_id211663543104186">On the <emph>Formatting</emph> bar, click</paragraph>
+ <table id="tab_id281663540719712">
+ <tablerow>
+ <tablecell>
+ <paragraph id="par_id431663540719713" role="paragraph">
+ <image src="cmd/lc_colorscaleformatdialog.svg" id="img_id551663540719714" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id381663540719715">Icon Color Scale</alt></image>
+ </paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id841663540719717" role="paragraph" xml-lang="en-US">Color Scale</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
+</section>
+
+<section id="s_conditionaldatabar">
+ <paragraph role="paragraph" id="par_id491663542108169"><variable id="conditionaldatabar">Choose <menuitem>Format - Conditional - Data Bar</menuitem></variable></paragraph>
+ <paragraph role="paragraph" id="par_id81663543094977">On the <emph>Formatting</emph> bar, click</paragraph>
+ <table id="tab_id441663541161942">
+ <tablerow>
+ <tablecell>
+ <paragraph id="par_id301663541161943" role="paragraph">
+ <image src="cmd/lc_databarformatdialog.svg" id="img_id601663541161944" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id21663541161945">Icon Data Bar</alt></image>
+ </paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id101663541161947" role="paragraph" xml-lang="en-US">Data Bar</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
+</section>
+
+<section id="s_conditionaliconset">
+ <paragraph role="paragraph" id="par_id851663542093712"><variable id="conditionaliconset">Choose <menuitem>Format - Conditional - Icon Set</menuitem></variable></paragraph>
+ <paragraph role="paragraph" id="par_id501663543087343">On the <emph>Formatting</emph> bar, click</paragraph>
+ <table id="tab_id621663541228727">
+ <tablerow>
+ <tablecell>
+ <paragraph id="par_id51663541228728" role="paragraph">
+ <image src="cmd/lc_iconsetformatdialog.svg" id="img_id511663541228729" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id261663541228730">Icon Icon Set</alt></image>
+ </paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id61663541228732" role="paragraph" xml-lang="en-US">Icon Set</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
+</section>
+
+<section id="s_conditionaldate">
+ <paragraph role="paragraph" id="par_id391663542070705"><variable id="conditionaldate">Choose <menuitem>Format - Conditional - Date</menuitem></variable></paragraph>
+ <paragraph role="paragraph" id="par_id351663543077670">On the <emph>Formatting</emph> bar, click</paragraph>
+ <table id="tab_id951663541317146">
+ <tablerow>
+ <tablecell>
+ <paragraph id="par_id371663541317147" role="paragraph">
+ <image src="cmd/lc_conddateformatdialog.svg" id="img_id61663541317148" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id641663541317149">Icon Date</alt></image>
+ </paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id121663541317151" role="paragraph" xml-lang="en-US">Date</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
+</section>
+
+<section id="s_conditionalmanage">
+ <paragraph role="paragraph" id="par_id641663542045446"><variable id="conditionalmanage">Choose <menuitem>Format - Conditional - Manage</menuitem></variable></paragraph>
+</section>
+
<section id="autoformat">
<paragraph role="paragraph" id="par_id3153916" xml-lang="en-US">Choose <emph>Format - AutoFormat Styles</emph>.</paragraph>
<paragraph role="paragraph" id="par_id3154532" xml-lang="en-US">On the <emph>Tools</emph> bar, click</paragraph>
@@ -77,6 +168,5 @@
</table>
</section>
</section>
-<paragraph role="paragraph" id="par_id3154618" xml-lang="en-US"><variable id="bedingte">Choose <emph>Format - Conditional</emph>.</variable></paragraph>
</body>
</helpdocument>
diff --git a/source/text/scalc/01/04060105.xhp b/source/text/scalc/01/04060105.xhp
index 24f8d9729..5b64c4a65 100644
--- a/source/text/scalc/01/04060105.xhp
+++ b/source/text/scalc/01/04060105.xhp
@@ -86,7 +86,7 @@
<paragraph xml-lang="en-US" id="par_id3145632" role="paragraph">
<item type="input">=AND(12&lt;13;14&gt;12;7&lt;6)</item> returns FALSE.</paragraph>
<paragraph xml-lang="en-US" id="par_id3149946" role="paragraph">
- <item type="input">=AND (FALSE;TRUE)</item> returns FALSE.</paragraph>
+ <item type="input">=AND(FALSE();TRUE())</item> returns FALSE.</paragraph>
</section>
<section id="Section5">
<bookmark xml-lang="en-US" branch="index" id="bm_id3149015"><bookmark_value>FALSE function</bookmark_value>
@@ -156,7 +156,7 @@
<paragraph xml-lang="en-US" id="par_id3155371" role="paragraph">
<item type="input">=OR(12&lt;11;13&gt;22;45=45)</item> returns TRUE.</paragraph>
<paragraph xml-lang="en-US" id="par_id3158412" role="paragraph">
- <item type="input">=OR(FALSE;TRUE)</item> returns TRUE.</paragraph>
+ <item type="input">=OR(FALSE();TRUE())</item> returns TRUE.</paragraph>
</section>
<section id="Section1">
<bookmark xml-lang="en-US" branch="index" id="bm_id3156256"><bookmark_value>TRUE function</bookmark_value>
@@ -188,11 +188,11 @@
<embed href="text/scalc/01/ful_func.xhp#logical255"/>
<embed href="text/scalc/01/common_func.xhp#sectionexample"/>
<paragraph xml-lang="en-US" id="par_id3083286" role="paragraph">
- <item type="input">=XOR(TRUE;TRUE)</item> returns FALSE</paragraph>
+ <item type="input">=XOR(TRUE();TRUE())</item> returns FALSE</paragraph>
<paragraph xml-lang="en-US" id="par_id3083445" role="paragraph">
- <item type="input">=XOR(TRUE;TRUE;TRUE)</item> returns TRUE</paragraph>
+ <item type="input">=XOR(TRUE();TRUE();TRUE())</item> returns TRUE</paragraph>
<paragraph xml-lang="en-US" id="par_id3154315" role="paragraph">
- <item type="input">=XOR(FALSE;TRUE)</item> returns TRUE</paragraph>
+ <item type="input">=XOR(FALSE();TRUE())</item> returns TRUE</paragraph>
</section>
</sort>
<section id="relatedtopics">
diff --git a/source/text/scalc/01/05120000.xhp b/source/text/scalc/01/05120000.xhp
index 9abe1ee3e..6e413af55 100644
--- a/source/text/scalc/01/05120000.xhp
+++ b/source/text/scalc/01/05120000.xhp
@@ -1,183 +1,86 @@
<?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 .
- -->
+ <!--
+ * 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="textscalc0105120000xml" indexer="include">
- <title xml-lang="en-US" id="tit">Conditional Formatting</title>
- <filename>/text/scalc/01/05120000.xhp</filename>
- </topic>
- </meta>
- <body>
-<bookmark xml-lang="en-US" branch="hid/.uno:ConditionalFormatDialog" id="bm_id5008046" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:ConditionalFormatMenu" id="bm_id5008047" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/conditionalformatdialog/ConditionalFormatDialog" id="bm_id3152518" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/conditionalformatdialog/@@nowidget@@" id="bm_id3152518" localize="false"/>
-<h1 id="hd_id3155132">Conditional Formatting</h1>
- <paragraph xml-lang="en-US" id="par_id3163710" role="paragraph"><variable id="bedingtetext"><ahelp hid=".">Use <emph>Conditional Formatting</emph> to define range-based conditions that determine which cell style will be applied to each cell in a given range based on its contents.</ahelp></variable> The cell style corresponding to the first condition that evaluates to <emph>true</emph> is applied. Cell styles applied through Conditional Formatting override cell styles applied manually using the <link href="text/scalc/main0202.xhp" name="FormattingBar_link"><emph>Formatting Bar</emph></link> or the <emph>Styles</emph> sidebar.</paragraph>
- <section id="howtoget">
- <embed href="text/scalc/00/00000405.xhp#bedingte"/>
- </section>
- <paragraph xml-lang="en-US" id="par_id3163711" role="paragraph">You can enter several conditions that query the cell values or results of formulas. The conditions are evaluated from first to the last. If <emph>Condition 1</emph> is true based on the current cell contents, the corresponding cell style is applied. Otherwise, <emph>Condition 2</emph> is evaluated to determine if its corresponding style will be applied. If none of the conditions match cell contents, then no changes are made to the cell format.</paragraph>
- <paragraph role="paragraph" id="par_id431642031216368">Conditional formats do no overwrite cell styles and direct formatting applied manually. They remain saved as cell properties and are applied when the cell matches no conditions or when you remove all conditional formats.</paragraph>
+ <meta>
+ <topic id="textscalc0105120000xml" indexer="include">
+ <title xml-lang="en-US" id="tit">Conditional Formatting</title>
+ <filename>/text/scalc/01/05120000.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <bookmark xml-lang="en-US" branch="hid/.uno:ConditionalFormatDialog" id="bm_id5008046" localize="false"/>
+ <bookmark xml-lang="en-US" branch="hid/.uno:ConditionalFormatMenu" id="bm_id5008047" localize="false"/>
+ <bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/conditionalformatdialog/ConditionalFormatDialog" id="bm_id3152518" localize="false"/>
+ <bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/conditionalformatdialog/@@nowidget@@" id="bm_id3152518" localize="false"/>
+ <h1 id="hd_id3155132">Conditional Formatting</h1>
+ <paragraph xml-lang="en-US" id="par_id3163710" role="paragraph"><variable id="bedingtetext"><ahelp hid=".">Use <emph>Conditional Formatting</emph> to define range-based conditions that determine which cell style will be applied to each cell in a given range based on its contents.</ahelp></variable> The cell style corresponding to the first condition that evaluates to <emph>true</emph> is applied. Cell styles applied through Conditional Formatting override cell styles applied manually using the <link href="text/scalc/main0202.xhp" name="FormattingBar_link"><emph>Formatting Bar</emph></link> or the <emph>Styles</emph> sidebar.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3163711" role="paragraph">You can enter several conditions that query the cell values or results of formulas. The conditions are evaluated from first to the last. If <emph>Condition 1</emph> is true based on the current cell contents, the corresponding cell style is applied. Otherwise, <emph>Condition 2</emph> is evaluated to determine if its corresponding style will be applied. If none of the conditions match cell contents, then no changes are made to the cell format.</paragraph>
+ <paragraph role="paragraph" id="par_id431642031216368">Conditional formats do not overwrite cell styles and direct formatting applied manually. They remain saved as cell properties and are applied when the cell matches no conditions or when you remove all conditional formats.</paragraph>
<warning id="par_id2414014">To apply conditional formatting, AutoCalculate must be enabled. Choose <emph>Data - Calculate - AutoCalculate</emph> (you see a check mark next to the command when AutoCalculate is enabled).</warning>
-<bookmark xml-lang="en-US" branch="index" id="bm_id3153189"><bookmark_value>conditional formatting; conditions</bookmark_value>
-</bookmark>
-<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/conditionalformatdialog/list" id="bm_id5008050" localize="false"/>
-<h2 id="hd_id71624649758112">Condition list</h2>
+
+ <h2 id="hd_id961662926287139">Cell range</h2>
+ <section id="howtoget">
+ <embed href="text/scalc/00/00000405.xhp#s_conditionalcondition"/>
+ </section>
+ <h3 id="hd_id431662926282555">Range</h3>
+ <paragraph xml-lang="en-US" id="par_id31494138" role="paragraph">Defines the range of cells concerned by the conditional formatting. Click on the <emph>Shrink</emph> button to minimize the dialog box. Click again on the button to come back to the dialog box once the range is selected.</paragraph>
+
+ <bookmark xml-lang="en-US" branch="index" id="bm_id3153189"><bookmark_value>conditional formatting; conditions</bookmark_value>
+ </bookmark>
+ <bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/conditionalformatdialog/list" id="bm_id5008050" localize="false"/>
+
+ <bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/conditionalformatdialog/edassign" id="bm_id5008055" localize="false"/>
+ <h2 id="hd_id71624649758112">Condition list</h2>
<paragraph xml-lang="en-US" id="par_id3149413" role="paragraph">List of the conditions defined for the cell range in order of evaluation. You can define as many conditions as you want.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/conditionalformatdialog/up" id="bm_id5008053" localize="false"/>
-<h3 id="hd_id41624649786605">Up</h3>
-<paragraph xml-lang="en-US" id="par_id3149414" role="paragraph"><ahelp hid=".">Increase priority of the selected condition.</ahelp></paragraph>
+ <bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/conditionalformatdialog/up" id="bm_id5008053" localize="false"/>
+ <h3 id="hd_id41624649786605">Up</h3>
+ <paragraph xml-lang="en-US" id="par_id3149414" role="paragraph"><ahelp hid=".">Increase priority of the selected condition.</ahelp></paragraph>
<h3 id="hd_id861624649792266">Down</h3>
<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/conditionalformatdialog/down" id="bm_id5008054" localize="false"/>
<paragraph xml-lang="en-US" id="par_id3149415" role="paragraph"><ahelp hid=".">Decrease priority of the selected condition.</ahelp></paragraph>
-
-<h2 id="hd_id31531891">Condition list entry</h2>
- <paragraph xml-lang="en-US" id="par_id31494132" role="paragraph">Specify if conditional formatting is dependent on one of the entry listed on the drop down box:</paragraph>
<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/conditionalformatdialog/add" id="bm_id5008051" localize="false"/>
+ <h3 id="hd_id71662926011736">Add</h3>
+ <paragraph role="paragraph" id="par_id721662926016039">Adds the condition to the condition list.</paragraph>
<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/conditionalformatdialog/delete" id="bm_id5008052" localize="false"/>
- <bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/conditionalformatdialog/edassign" id="bm_id5008055" localize="false"/>
- <list type="unordered">
- <listitem>
- <paragraph xml-lang="en-US" id="par_id31494133" role="listitem">If you select <emph>All cells</emph>, see Color Scale, Data Bar or Icon Set explanations below, depending on which visual representation the conditional formatting should be represented.</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id31494134" role="listitem">If you select <emph>Cell value is</emph>:</paragraph>
- <switch select="sys"><comment>FIXME: Hack to get a nested list</comment><default>
- <list type="unordered">
- <listitem>
- <paragraph xml-lang="en-US" id="par_id31494135" role="listitem">Select a condition in the drop down list for the format to be applied to the selected cells and enter the value.</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id31494136" role="listitem">In front of <emph>Apply Styles</emph>, select the desired style in the list or chose <emph>New Style</emph> to create one.</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id31494137" role="listitem"><ahelp hid=".">Click the <emph>Add</emph> button to add another condition, click the <emph>Remove</emph> button to remove a condition.</ahelp></paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id31494138" role="listitem"><ahelp hid=".">In the <emph>Range</emph> field, define the range of cells concerned by the conditional formatting.</ahelp> Click on the <emph>Shrink</emph> button to minimize the dialog box. Click again on the button to come back to the dialog box once the range is selected.</paragraph>
- </listitem>
- </list>
- </default></switch>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id31494139" role="listitem">If you select <emph>Formula is</emph> as a reference, enter a cell reference. If the cell reference is a value other than zero, the condition matches.</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3149413a" role="listitem">If you select <emph>Date is</emph>, see below explanations for Date.</paragraph>
- </listitem>
- </list>
-
-<h2 id="hd_id3147394">Color Scale</h2>
- <paragraph xml-lang="en-US" id="par_id3155602" role="paragraph">This is the same dialog box as if you select <emph>All cells</emph> in the first sub menu entry <emph>Condition</emph>.
-Apply a color scale to a range consist of displaying a bicolor or tricolor gradient on this range depending on the value of each cell. A typical example might be an array of temperatures, lower blue colored, warmer red with a gradient nuances to the intermediate values.</paragraph>
- <paragraph xml-lang="en-US" id="par_id3155603" role="paragraph">You must choose the two "extreme" colors indicate the method of calculation. The calculation of the color applied will be made in relation to: Min - Max - Percentile - Value - Percent - Formula.</paragraph>
- <paragraph xml-lang="en-US" id="par_id3155604" role="paragraph">The choices Min and Max are sufficient to themselves as found in the range. Other options need to be specified by a value (Percentile, Value, Percentage) or a cell reference or formula (Formula).</paragraph>
- <paragraph xml-lang="en-US" id="par_id3155605" role="paragraph">For a detailed explanation and examples, please visit <link href="https://wiki.documentfoundation.org/Faq/Calc/142">How to apply a Color Scale Conditional Formatting page</link> in TDF Wiki.</paragraph>
-
-<h2 id="par_id991609782427459">Data Bar</h2>
- <paragraph role="paragraph" id="par_id41609780964157">Data bar option will fill the cell with solid or gradient color corresponding to the numeric value in the cell. Default is blue for positive and red for negative. </paragraph>
- <paragraph role="paragraph" id="par_id931609781970981">The calculation of the area of fill is based on Min - Max - Percentile - Value - Percent - Formula.</paragraph>
- <paragraph role="paragraph" id="par_id981609782003841">The choices Min and Max are sufficient to themselves as found in the range. Other options need to be specified by a value (Percentile, Value, Percentage) or a cell reference or formula (Formula).</paragraph>
- <paragraph role="paragraph" id="par_id281609781729359"><emph>More Options...</emph> opens a dialog to: </paragraph>
- <list type="unordered">
- <listitem>
- <paragraph id="par_id271609781812913" role="listitem">change colors</paragraph>
- </listitem>
- <listitem>
- <paragraph id="par_id921609781838551" role="listitem"> change position of vertical axis within the cell</paragraph>
- </listitem>
- <listitem>
- <paragraph id="par_id631609781859971" role="listitem"> the bar's minimum and maximum length in percentage</paragraph>
- </listitem>
- </list>
-
-<h2 id="hd_id3153709">Icon Set</h2>
- <paragraph xml-lang="en-US" id="par_id3153764" role="paragraph">It is desired to plot the position of a value relative to the thresholds. The set of icons will help to indicate the thresholds and choose the type of icons. Available icon sets are:</paragraph>
-<list type="unordered">
-<listitem>
- <paragraph xml-lang="en-US" id="par_id31494140" role="listitem">3, 4 or 5 - arrows</paragraph>
-</listitem>
-<listitem>
- <paragraph xml-lang="en-US" id="par_id31494141" role="listitem">3, 4 or 5 - gray arrows</paragraph>
-</listitem>
-<listitem>
- <paragraph xml-lang="en-US" id="par_id31494142" role="listitem">3 - flags</paragraph>
-</listitem>
-<listitem>
- <paragraph xml-lang="en-US" id="par_id31494143" role="listitem">3 - traffic lights 1 and 2 (two different designs)</paragraph>
-</listitem>
-<listitem>
- <paragraph xml-lang="en-US" id="par_id31494144" role="listitem">3 - symbols (square, triangle, circle)</paragraph>
-</listitem>
-<listitem>
- <paragraph xml-lang="en-US" id="par_id31494145" role="listitem">4 - circles from red to black</paragraph>
-</listitem>
-<listitem>
- <paragraph xml-lang="en-US" id="par_id31494146" role="listitem">4 or 5 - ratings</paragraph>
-</listitem>
-<listitem>
- <paragraph xml-lang="en-US" id="par_id31494147" role="ilistitem">5 - quarters</paragraph>
-</listitem>
-</list>
- <paragraph xml-lang="en-US" id="par_id3153765" role="paragraph">Conditions to display each icon can be specified relative to a value (Value), a percentage of the number of values in the range (Percentage) as a percentage of range values (Percentile) or formula (Formula).</paragraph>
- <paragraph xml-lang="en-US" id="par_id3155606" role="paragraph">For a detailed explanation and examples, please visit <link href="https://wiki.documentfoundation.org/Faq/Calc/141">How to use Icon Set Conditional Formatting page</link> in TDF Wiki.</paragraph>
-
-<h2 id="hd_id3156384">Dates</h2>
- <paragraph xml-lang="en-US" id="par_id3145228" role="paragraph">This option will apply a defined style depending on a date that you choose in the drop down box: Today - Yesterday - Tomorrow - Last 7 days - This week - Last week.</paragraph>
-<list type="unordered">
-<listitem>
- <paragraph xml-lang="en-US" id="par_id31494157" role="listitem">In front of <emph>Apply Styles</emph>, select the desired style in the list or chose <emph>New Style</emph> to create one.</paragraph>
-</listitem>
-<listitem>
- <paragraph xml-lang="en-US" id="par_id31494167" role="listitem">Click the <emph>Add</emph> button to add another condition, click the <emph>Remove</emph> button to remove a condition.</paragraph>
-</listitem>
-<listitem>
- <paragraph xml-lang="en-US" id="par_id31494177" role="listitem">In the <emph>Range</emph> field, define the range of cells concerned by the conditional formatting. Click on the <emph>Shrink</emph> button to minimize the dialog box. Click again on the button to come back to the dialog box once the range is selected.</paragraph>
-</listitem>
-</list>
-
-<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/condformatmanager/CondFormatManager" id="bm_id3152598" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/condformatmanager/@@nowidget@@" id="bm_id3152598" localize="false"/>
-<h2 id="hd_id3153384">Manage Conditional Formatting</h2>
-<paragraph xml-lang="en-US" id="par_id3155906" role="paragraph"><ahelp hid=".">This dialog allows you to see all the conditional formatting defined in the spreadsheet.</ahelp></paragraph>
-
- <section id="howtoget">
- <paragraph role="paragraph" id="par_id31546818" xml-lang="en-US">Choose <emph>Format - Conditional Formatting - Manage</emph>.</paragraph>
- </section>
-<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/condformatmanager/add" id="bm_id3152600" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/condformatmanager/edit" id="bm_id3152601" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/condformatmanager/remove" id="bm_id3152602" localize="false"/>
-<paragraph xml-lang="en-US" id="par_id3155907" role="paragraph">The <emph>Manage Conditional Formatting</emph> dialog box opens. <ahelp hid=".">Here you can add, edit or remove one or several conditional formattings.</ahelp></paragraph>
-
-<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/condformatmanager/CONTAINER" id="bm_id3152603" localize="false"/>
-<paragraph xml-lang="en-US" id="par_id3155909" role="paragraph"><ahelp hid=".">The <emph>Conditional Formats</emph> list displays the active conditional formatting rules set in the current spreadsheet.</ahelp> Only the first rule for each cell range is listed, even if there are multiple rules defined for a given range.</paragraph>
-
-<paragraph xml-lang="en-US" id="par_id3155908" role="paragraph">If you have defined a conditional formatting on a cell range and you try now to define a new conditional formatting on a part of this range, a warning message will be displayed, asking if you want to edit the existing conditional formatting (on the whole range) or define a new conditional formatting overlapping it (on the selected range).</paragraph>
+ <h3 id="hd_id401662926020291">Delete</h3>
+ <paragraph role="paragraph" id="par_id301662926026944">Deletes the condition from the condition list.</paragraph>
+ <bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/conditionalentry/type" id="bm_id941662938267119" localize="false"/>
+ <h2 id="hd_id31531891">Condition list entries</h2>
+ <paragraph xml-lang="en-US" id="par_id31494132" role="paragraph">Specify if conditional formatting is dependent on one of the entry listed on the drop down box.</paragraph>
+ <embed href="text/scalc/01/05120100.xhp#cellvalueis"/>
+ <embed href="text/scalc/01/05120200.xhp#formulais"/>
+ <embed href="text/scalc/01/05120300.xhp#dateis"/>
+ <embed href="text/scalc/01/05120400.xhp#allcells"/>
+ <embed href="text/scalc/01/05120400.xhp#colorscale"/>
+ <embed href="text/scalc/01/05120400.xhp#databar"/>
+ <embed href="text/scalc/01/05120400.xhp#iconset"/>
+ <bookmark xml-lang="en-US" branch="modules/scalc/ui/conditionalentry/style" id="bm_id241662938779751" localize="false"/>
+ <h2 id="hd_id431662938949798">Apply Style</h2>
+ <paragraph role="paragraph" id="par_id971662939043786">Select the cell style to apply when the condition is verified. Select <emph>New Style</emph> to open the <link href="text/scalc/01/cell_styles.xhp" name="cellstyledialog">Cell Style dialog</link> and define the style properties.</paragraph>
+ <embed href="text/scalc/01/05120500.xhp#manageconditions"/>
<section id="relatedtopics">
- <paragraph xml-lang="en-US" id="par_idN107E1" role="paragraph" localize="false">
- <embedvar href="text/scalc/guide/cellstyle_conditional.xhp#cellstyle_conditional"/>
- </paragraph>
+ <paragraph xml-lang="en-US" id="par_idN107E1" role="paragraph" localize="false">
+ <embedvar href="text/scalc/guide/cellstyle_conditional.xhp#cellstyle_conditional"/>
+ </paragraph>
</section>
- </body>
+</body>
</helpdocument>
diff --git a/source/text/scalc/01/05120100.xhp b/source/text/scalc/01/05120100.xhp
new file mode 100644
index 000000000..6e500c3af
--- /dev/null
+++ b/source/text/scalc/01/05120100.xhp
@@ -0,0 +1,317 @@
+<?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="conditionalformattingcellis" indexer="include" status="PUBLISH">
+ <title id="tit" xml-lang="en-US">Conditional Formatting - Cell value is</title>
+ <filename>/text/scalc/01/05120100.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+
+ <bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/conditionalentry/typeis" id="bm_id941662938267119" localize="false"/>
+ <bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/conditionalentry/val1" id="bm_id811662938541882" localize="false"/>
+ <section id="cellvalueis">
+ <h1 id="hd_id431662935550205"><variable id="h1"><link href="text/scalc/01/05120100.xhp" name="Cell Value">Condition - Cell value is</link></variable></h1>
+ <paragraph role="paragraph" id="par_id11662915615351">Applies a cell style on the cell or cell range controlled by the condition set in the drop down list. The formatting is applied to each cell individually and the condition may depend on other cells values of the selected range.</paragraph>
+ </section>
+ <section id="howtoget">
+ <embed href="text/scalc/00/00000405.xhp#s_conditionalcondition"/>
+ </section>
+ <table id="tab_id211662913907277">
+ <tablerow>
+ <tablecell>
+ <paragraph id="par_id181662913907279" role="tablehead" xml-lang="en-US">Condition</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id221663406419144" role="tablehead" xml-lang="en-US" >Applies on</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id941662913907280" role="tablehead" xml-lang="en-US">Description</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph id="par_id31662913907282" role="tablecontent" xml-lang="en-US">is equal to</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id321663406539530" role="tablecontent" xml-lang="en-US" ><variable id="numbertext">Numbers and text</variable></paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id881662913907284" role="tablecontent" xml-lang="en-US">The cell value equals the user defined value in text box in the right. Use text inside quotes if you compare text values.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph id="par_id271662914239763" role="tablecontent" xml-lang="en-US" >is less than</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id121663406585137" role="tablecontent" xml-lang="en-US" ><variable id="numbers">Numbers</variable></paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id501662914239764" role="tablecontent" xml-lang="en-US" >The cell value is strictly less than the user defined value in the text box in the right.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph id="par_id701662914433053" role="tablecontent" xml-lang="en-US" >is greater than</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id201663406628969" role="tablecontent" localize="false" xml-lang="en-US" ><embedvar href="text/scalc/01/05120100.xhp#numbers" markup="ignore"/></paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id461662914433054" role="tablecontent" xml-lang="en-US" >The cell value is strictly greater than the user defined value in the text box in the right.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph id="par_id421662914480517" role="tablecontent" xml-lang="en-US" >is less than or equal to</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id301663406628969" role="tablecontent" localize="false" xml-lang="en-US" ><embedvar href="text/scalc/01/05120100.xhp#numbers" markup="ignore"/></paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id631662914480518" role="tablecontent" xml-lang="en-US" >The cell value is less than or equal to the user defined value in the text box in the right.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph id="par_id651662914713102" role="tablecontent" xml-lang="en-US" >is greater than or equal to</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id401663406628969" role="tablecontent" localize="false" xml-lang="en-US" ><embedvar href="text/scalc/01/05120100.xhp#numbers" markup="ignore"/></paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id251662914713103" role="tablecontent" xml-lang="en-US" >The cell value is greater than or equal to the user defined value in the text box in the right.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph id="par_id831662914760085" role="tablecontent" xml-lang="en-US" >is not equal to</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id501663406628969" role="tablecontent" xml-lang="en-US" localize="false">
+ <embedvar href="text/scalc/01/05120100.xhp#numbertext" markup="ignore"/></paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id301662914760087" role="tablecontent" xml-lang="en-US" >The cell value is not equal (different) to the user defined value in the text box in the right. Use text inside quotes if you compare text values.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph id="par_id81662914901503" role="tablecontent" xml-lang="en-US" >is between</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id601663406628969" role="tablecontent" localize="false" xml-lang="en-US" ><embedvar href="text/scalc/01/05120100.xhp#numbers" markup="ignore"/></paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id21662914901504" role="tablecontent" xml-lang="en-US" >The cell value is between the two values defined in the text boxes on the right - lower and upper values - including the boundary values themselves.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph id="par_id411662915178872" role="tablecontent" xml-lang="en-US" >is not between</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id701663406628969" role="tablecontent" localize="false" xml-lang="en-US" ><embedvar href="text/scalc/01/05120100.xhp#numbers" markup="ignore"/></paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id861662915178873" role="tablecontent" xml-lang="en-US" >The cell value is not between the two values defined in the text boxes on the right - lower and upper values - including the boundary values themselves.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph id="par_id731662915275926" role="tablecontent" xml-lang="en-US" >is duplicate</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id801663406628969" role="tablecontent" localize="false" xml-lang="en-US" ><embedvar href="text/scalc/01/05120100.xhp#numbertext" markup="ignore"/></paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id881662915275927" role="tablecontent" xml-lang="en-US" >The cell and at least one other cell in the range have equal contents.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph id="par_id381662915857686" role="tablecontent" xml-lang="en-US" >is not duplicate</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id901663406628969" role="tablecontent" localize="false" xml-lang="en-US" ><embedvar href="text/scalc/01/05120100.xhp#numbertext" markup="ignore"/></paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id341662915857687" role="tablecontent" xml-lang="en-US" >The cell contents is unique in the range.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph id="par_id1001662915996409" role="tablecontent" xml-lang="en-US" >is in top N elements</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id101663406628969" role="tablecontent" localize="false" xml-lang="en-US" ><embedvar href="text/scalc/01/05120100.xhp#numbers" markup="ignore"/></paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id571662915996410" role="tablecontent" xml-lang="en-US" >The cell value is between the maximum value in the range and the N<sup>th</sup> greater element of the same. Enter the value of N in the text box on the right.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph id="par_id341662916338175" role="tablecontent" xml-lang="en-US" >is in bottom N elements</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id111663406628969" role="tablecontent" localize="false" xml-lang="en-US" ><embedvar href="text/scalc/01/05120100.xhp#numbers" markup="ignore"/></paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id11662916338177" role="tablecontent" xml-lang="en-US" >The cell value is between the minimum value in the range and the N<sup>th</sup> lower element of the same. Enter the value of N in the text box on the right.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph id="par_id181662916407095" role="tablecontent" xml-lang="en-US" >is in top N percent</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id121663406628969" role="tablecontent" localize="false" xml-lang="en-US" ><embedvar href="text/scalc/01/05120100.xhp#numbers" markup="ignore"/></paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id911662916407097" role="tablecontent" xml-lang="en-US" >The <emph>cell range index value is in the top N percent</emph> of the number of cells in the range. For example, in a 20 cells range and N equals 20, the style is applied to the 4 last cells of the range. Enter the value of N in the text box on the right.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph id="par_id421662917285432" role="tablecontent" xml-lang="en-US" >is in bottom N percent</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id121663406628969" role="tablecontent" localize="false" xml-lang="en-US" ><embedvar href="text/scalc/01/05120100.xhp#numbers" markup="ignore"/></paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id111662917285433" role="tablecontent" xml-lang="en-US" >The <emph>cell range index value is in the bottom N percent</emph> of the number of cells in the range. For example, in a 20 cells range and N equals 20, the style is applied to the 4 first cells of the range. Enter the value of N in the text box on the right.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph id="par_id861662917382735" role="tablecontent" xml-lang="en-US" >is above average</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id131663406628969" role="tablecontent" localize="false" xml-lang="en-US" ><embedvar href="text/scalc/01/05120100.xhp#numbers" markup="ignore"/></paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id811662917382736" role="tablecontent" xml-lang="en-US" >The cell value is strictly greater than the average of the cell range values.</paragraph>
+ <embed href="text/scalc/01/common_func.xhp#datenumbersequencenote"/>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph id="par_id421662919561954" role="tablecontent" xml-lang="en-US" >is below average</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id141663406628969" role="tablecontent" localize="false" xml-lang="en-US" ><embedvar href="text/scalc/01/05120100.xhp#numbers" markup="ignore"/></paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id661662919561956" role="tablecontent" xml-lang="en-US" >The cell value is strictly less than the average of the cell range values.</paragraph>
+ <embed href="text/scalc/01/common_func.xhp#datenumbersequencenote"/>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph id="par_id831662919693474" role="tablecontent" xml-lang="en-US" >is above or equal average</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id151663406628969" role="tablecontent" localize="false" xml-lang="en-US" ><embedvar href="text/scalc/01/05120100.xhp#numbers" markup="ignore"/></paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id71662919693475" role="tablecontent" xml-lang="en-US" >The cell value is greater or equal than the average of the cell range values.</paragraph>
+ <embed href="text/scalc/01/common_func.xhp#datenumbersequencenote"/>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph id="par_id521662919771410" role="tablecontent" xml-lang="en-US" >is below or equal average</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id161663406628969" role="tablecontent" localize="false" xml-lang="en-US" ><embedvar href="text/scalc/01/05120100.xhp#numbers" markup="ignore"/></paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id131662919771411" role="tablecontent" xml-lang="en-US" >The cell value is less or equal than the average of the cell range values.</paragraph>
+ <embed href="text/scalc/01/common_func.xhp#datenumbersequencenote"/>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph id="par_id451662919849856" role="tablecontent" xml-lang="en-US" >is error</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id171663406628969" role="tablecontent" localize="false" xml-lang="en-US" ><embedvar href="text/scalc/01/05120100.xhp#numbertext" markup="ignore"/></paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id911662919849857" role="tablecontent" xml-lang="en-US" >The cell is in the error condition defined in the text box on the right. <link href="text/scalc/05/02140000.xhp" name="calc errors">List of Calc errors</link>.</paragraph>
+ <tip id="par_id61662920733334">A cell that references another cell with an error condition is not in error itself.</tip>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph id="par_id961662920774180" role="tablecontent" xml-lang="en-US" >is not error</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id181663406628969" role="tablecontent" localize="false" xml-lang="en-US" ><embedvar href="text/scalc/01/05120100.xhp#numbertext" markup="ignore"/></paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id381662920774181" role="tablecontent" xml-lang="en-US" >The cell is not in the error condition defined in the text box on the right. <link href="text/scalc/05/02140000.xhp" name="calc errors">List of Calc errors</link></paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph id="par_id151662920861587" role="tablecontent" xml-lang="en-US" >begins with</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id191663406628969" role="tablecontent" localize="false" xml-lang="en-US" ><embedvar href="text/scalc/01/05120100.xhp#numbertext" markup="ignore"/></paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id341662920861588" role="tablecontent" xml-lang="en-US" >The cell contents begins with the text or number defined in the text box on the right.</paragraph>
+ <note id="par_id801662922586796"><variable id="text_comparison">The condition applies to the internal text conversion of the cell contents. Numeric values are compared with their equivalent text representation. Numeric cell formats (currency, scientific, user-defined ... ) are not considered for comparisons.</variable></note>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph id="par_id361662922600585" role="tablecontent" xml-lang="en-US" >ends with</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id201663406628969" role="tablecontent" localize="false" xml-lang="en-US" ><embedvar href="text/scalc/01/05120100.xhp#numbertext" markup="ignore"/></paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id801662922600586" role="tablecontent" xml-lang="en-US" >The cell contents ends with the text or number defined in the right text box.</paragraph>
+ <note localize="false" id="par_id221662923585290"><embedvar href="text/scalc/01/05120100.xhp#text_comparison" markup="keep"/></note>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph id="par_id151662922939292" role="tablecontent" xml-lang="en-US" >contains</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id211663406628969" role="tablecontent" localize="false" xml-lang="en-US" ><embedvar href="text/scalc/01/05120100.xhp#numbertext" markup="ignore"/></paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id251662922939293" role="tablecontent" xml-lang="en-US" >The cell contents contains the text or number defined in the right text box.</paragraph>
+ <note localize="false" id="par_id221662923585291"><embedvar href="text/scalc/01/05120100.xhp#text_comparison" markup="keep"/></note>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph id="par_id291662923021542" role="tablecontent" xml-lang="en-US" >does not contain</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id221663406628969" role="tablecontent" localize="false" xml-lang="en-US" ><embedvar href="text/scalc/01/05120100.xhp#numbertext" markup="ignore"/></paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id541662923021543" role="tablecontent" xml-lang="en-US" >The cell contents does not contains the text or number defined in the text box on the right.</paragraph>
+ <note localize="false" id="par_id221662923585292"><embedvar href="text/scalc/01/05120100.xhp#text_comparison" markup="keep"/></note>
+ </tablecell>
+ </tablerow>
+ </table>
+</body>
+</helpdocument>
diff --git a/source/text/scalc/01/05120200.xhp b/source/text/scalc/01/05120200.xhp
new file mode 100644
index 000000000..0ca166372
--- /dev/null
+++ b/source/text/scalc/01/05120200.xhp
@@ -0,0 +1,26 @@
+<?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="pageconditionalformattingformulais" indexer="include" status="PUBLISH">
+ <title id="tit" xml-lang="en-US">Conditional Formatting - Formula is</title>
+ <filename>/text/scalc/01/05120200.xhp</filename>
+ </topic>
+</meta>
+<body>
+<section id="formulais">
+ <h1 id="hd_id471662936567369"><variable id="h1"><link href="text/scalc/01/05120200.xhp" name="Formula is">Condition - Formula is</link></variable></h1>
+ <paragraph xml-lang="en-US" id="par_id31494139" role="paragraph">Applies the selected style to the cell when the formula expression in the text box in the right is <emph>not</emph> zero.</paragraph>
+</section>
+ <paragraph role="paragraph" id="par_id1001662932287796">The formula is expressed similar to a test condition evaluating to <literal>TRUE</literal> or <literal>FALSE</literal>.</paragraph>
+ <paragraph role="paragraph" id="par_id111662936728630">For example, if C29 has a conditional formatting which formula is <input>B1>=(DATE(2015;5;4)+TIME(18;0;0))</input> - a logical expression that evaluates true or false - the style applied to C29 depends on B1 contents.</paragraph>
+</body>
+</helpdocument>
diff --git a/source/text/scalc/01/05120300.xhp b/source/text/scalc/01/05120300.xhp
new file mode 100644
index 000000000..3ed829c79
--- /dev/null
+++ b/source/text/scalc/01/05120300.xhp
@@ -0,0 +1,51 @@
+<?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="conditional formattingdateis" indexer="include" status="PUBLISH">
+ <title id="tit" xml-lang="en-US">Conditional Formatting - Date is</title>
+ <filename>/text/scalc/01/05120300.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="dateis">
+ <h1 id="hd_id321662936831682"><variable id="h1"><link href="text/scalc/01/05120300.xhp" name="Date is">Condition - Date is</link></variable></h1>
+ <paragraph role="paragraph" id="par_id31662934883939">Applies the selected style to the cell when the cell contents is formatted as date and the condition is one of the available date interval in the dropdown list.</paragraph>
+ </section>
+ <section id="howtoget">
+ <embed href="text/scalc/00/00000405.xhp#s_conditionaldate"/>
+ </section>
+ <list type="unordered">
+ <listitem>
+ <paragraph id="par_id231662933568615" role="listitem"><emph>Today</emph>: applies the cell style if the cell date contents is today.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph id="par_id891662933647849" role="listitem"><emph>Yesterday</emph>: applies the cell style if the cell date contents is yesterday.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph id="par_id701662933702962" role="listitem"><emph>Tomorrow</emph>: applies the cell style if the cell date contents is tomorrow.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph id="par_id291662933755624" role="listitem"><emph>Last 7 days</emph>: applies the cell style if the cell date contents is in the last 7 calendar days.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph id="par_id151662933849611" role="listitem"><emph>This week, Last week and Next week</emph>: applies the cell style if the cell date contents is in this week, last week and next week respectively. The start and end of the week is locale dependent.</paragraph>
+ </listitem>
+
+ <listitem>
+ <paragraph id="par_id421662934429482" role="listitem"><emph>This month, Last month and Next month</emph>: applies the cell style if the cell date contents is in this month, last month and next month respectively.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph id="par_id461662934605639" role="listitem"><emph>This year, Last year and Next year</emph>: applies the cell style if the cell date contents is in this year, last year and next year respectively.</paragraph>
+ </listitem>
+ </list>
+</body>
+</helpdocument>
diff --git a/source/text/scalc/01/05120400.xhp b/source/text/scalc/01/05120400.xhp
new file mode 100644
index 000000000..c5e90c644
--- /dev/null
+++ b/source/text/scalc/01/05120400.xhp
@@ -0,0 +1,243 @@
+<?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="conditionalformattingallcells" indexer="include" status="PUBLISH">
+ <title id="tit" xml-lang="en-US">Conditional Formatting - All cells</title>
+ <filename>/text/scalc/01/05120400.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+
+ <section id="allcells">
+ <h1 id="hd_id861662937013389"><variable id="h1"><link href="text/scalc/01/05120400.xhp" name="All cells">Condition - All cells</link></variable></h1>
+ <paragraph role="paragraph" id="par_id31662915586650">Applies the conditional formatting to the set of cells defined in the selected range. The formatting is applied based on the contents of the whole range.</paragraph>
+ </section>
+ <section id="colorscale">
+ <h2 id="hd_id3147394"><link href="text/scalc/01/05120400.xhp#colorscale" name="Color Scale">Color Scale</link></h2>
+ <paragraph xml-lang="en-US" id="par_id3155602" role="paragraph">Applies a color scale to a range consisting of displaying a bicolor or tricolor gradient on this range depending on the value of each cell.</paragraph>
+ </section>
+ <section id="howtoget">
+ <embed href="text/scalc/00/00000405.xhp#s_conditionalcolorscale"/>
+ </section>
+
+ <h3 id="hd_id541663598275609">Conditions</h3>
+ <paragraph role="paragraph" id="par_id231663598294535">The calculation of the color scale depends on 2 or 3 conditions, defined as follows:</paragraph>
+ <list type="unordered">
+ <listitem>
+ <paragraph id="par_id701864449697771" role="listitem"><emph>Min (Max)</emph>: calculates using the minimum (maximum) values in the range.</paragraph>
+ </listitem>
+ </list>
+ <section id="commonconditions">
+ <list type="unordered">
+ <listitem>
+ <paragraph id="par_id321663440728295" role="listitem"><emph>Value</emph>: a fixed value. Enter the value in the text box.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph id="par_id611663440697270" role="listitem"><emph>Percentile</emph>: A percentile is each of the 99 values which divide the sorted data in 100 equal parts, so that each part represents 1/100 of the sample population. A percentile return the value for a data series going from the smallest to the largest value in a set of data. For P = 25, the percentile means the first quartile. P = 50 is also the MEDIAN of the data set. Enter the percentile value in the text box. Valid values are from 0 to 100.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph id="par_id211663440834104" role="listitem"><emph>Percent</emph>: a fixed value representing the percentage of the minimum (maximum) of the length defined by minimum and maximum values in the range. A minimum of 10% selects the values below 10% of the segment [Min,Max]. A maximum of 80% select values above 80% of the segment [Min,Max]. Valid values are from 0 (zero) to 100. Do not enter a percent (%) sign.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph id="par_id961663440848168" role="listitem"><emph>Formula</emph>: A formula expression starting with the equal sign (=) that calculates a numeric value. Values can be numbers, dates or time. Enter the formula expression in the text box.</paragraph>
+ </listitem>
+ </list>
+ </section>
+ <embed href="text/scalc/06/calcsamplefiles.xhp#conditionalformatting"/>
+ <section id="databar">
+ <h2 id="par_id991609782427459"><link href="text/scalc/01/05120400.xhp#databar" name="Data Bar">Data Bar</link></h2>
+ <paragraph role="paragraph" id="par_id41609780964157">Data bar option will fill the cell with solid or gradient color corresponding to the numeric value in the cell.</paragraph>
+ </section>
+ <section id="howtoget">
+ <embed href="text/scalc/00/00000405.xhp#s_conditionaldatabar"/>
+ </section>
+ <h3 id="hd_id631663449553346">Conditions</h3>
+ <paragraph role="paragraph" id="par_id931609781970981">The calculation of the bar area fill is based on the conditions below:</paragraph>
+ <list type="unordered">
+ <listitem>
+ <paragraph id="par_id281663449673792" role="listitem"><emph>Automatic</emph>: calculates using the minimum and maximum values in the range.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph id="par_id701663449697771" role="listitem"><emph>Min (Max)</emph>: calculates using the minimum (maximum) values in the range.</paragraph>
+ </listitem>
+ </list>
+ <embed href="text/scalc/01/05120400.xhp#commonconditions"/>
+ <h3 id="par_id281609781729359">More Options</h3>
+ <paragraph role="paragraph" id="par_id501663454998977">The Data Bar dialog opens to add details on the display of data bars.</paragraph>
+ <h4 id="hd_id221663453502042">Entry values</h4>
+ <paragraph role="paragraph" id="par_id891663453681870">Same as the conditions above.</paragraph>
+ <h4 id="hd_id511663453530293">Bar Colors</h4>
+ <paragraph role="paragraph" id="par_id371663453564807">Choose the color for positive and negative values.</paragraph>
+ <h4 id="hd_id891663453607961">Fill</h4>
+ <list type="unordered">
+ <listitem>
+ <paragraph id="par_id671663453639829" role="listitem"><emph>Gradient</emph>: set a color scale between the color of positive (negative) values and white.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph id="par_id551663453647462" role="listitem"><emph>Color</emph>: use the positive (negative) color for the entire data bar, no fade out gradient.</paragraph>
+ </listitem>
+ </list>
+ <h4 id="hd_id701663453750779">Axis</h4>
+ <paragraph role="paragraph" id="par_id691663453763746">Set the position of the vertical axis for the data bar. Values are</paragraph>
+ <list type="unordered">
+
+ <listitem>
+ <paragraph id="par_id381663453792294" role="listitem"><emph>Automatic:</emph> position the vertical axis in the middle of the maximum and minimum values.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph id="par_id791663453800602" role="listitem"><emph>Middle:</emph> set the vertical axis in the middle of the column.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph id="par_id461663453808288" role="listitem"><emph>None:</emph> do not display a vertical axis.</paragraph>
+ </listitem>
+ </list>
+ <h4 id="hd_id511663453851599">Bar Lengths</h4>
+ <paragraph role="paragraph" id="par_id601663453865023">Sets the minimum (maximum) length of the data bars, as a percentage of the column width.</paragraph>
+ <h4 id="hd_id211663453914830">Display bars only</h4>
+ <paragraph role="paragraph" id="par_id561663453936590">Do not display values in the cell, only the data bars.</paragraph>
+ <embed href="text/scalc/06/calcsamplefiles.xhp#conditionalformatting"/>
+ <section id="iconset">
+ <h2 id="hd_id3153709"><link href="text/scalc/01/05120400.xhp#iconset" name="Icon Set">Icon Set</link></h2>
+ <paragraph xml-lang="en-US" id="par_id3153764" role="paragraph">Add an icon to the cell based on the value relative to the specified thresholds. Several icon sets are available.</paragraph>
+ </section>
+ <section id="howtoget">
+ <embed href="text/scalc/00/00000405.xhp#s_conditionaliconset"/>
+ </section>
+ <h3 id="hd_id191663440362309">Available Icon Sets</h3>
+ <list type="unordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id31494140" role="listitem">3, 4 or 5 - arrows</paragraph>
+ <paragraph role="paragraph" id="par_id91663429174806" xml-lang="en-US">
+ <image src="media/icon-themes/sc/res/icon-set-colorarrows-up.svg" id="img_id261663429174807" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id81663429174808">Color arrow up</alt></image>
+ <image src="media/icon-themes/sc/res/icon-set-colorarrows-slightly-up.svg" id="img_id261663429176807" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id81663529174808">Color arrow slightly up</alt></image>
+ <image src="media/icon-themes/sc/res/icon-set-colorarrows-same.svg" id="img_id261663429176807" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id81663529174808">Color arrow same</alt></image>
+ <image src="media/icon-themes/sc/res/icon-set-colorarrows-slightly-down.svg" id="img_id261663429176807" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id81663729174808">Color arrow slightly down</alt></image>
+ <image src="media/icon-themes/sc/res/icon-set-colorarrows-down.svg" id="img_id261663429176807" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id81663329174808">Color arrow down</alt></image>
+ </paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id31494141" role="listitem">3, 4 or 5 - gray arrows</paragraph>
+ <paragraph role="paragraph" id="par_id91661429174806" xml-lang="en-US">
+ <image src="media/icon-themes/sc/res/icon-set-grayarrows-up.svg" id="img_id261663429174807" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id91663429174808">Gray arrow up</alt></image>
+ <image src="media/icon-themes/sc/res/icon-set-grayarrows-slightly-up.svg" id="img_id261663429176807" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id91663529174808">Gray arrow slightly up</alt></image>
+ <image src="media/icon-themes/sc/res/icon-set-grayarrows-same.svg" id="img_id261663429176807" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id91663529174808">Gray arrow same</alt></image>
+ <image src="media/icon-themes/sc/res/icon-set-grayarrows-slightly-down.svg" id="img_id261663429176807" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id91663729174808">Gray arrow slightly down</alt></image>
+ <image src="media/icon-themes/sc/res/icon-set-grayarrows-down.svg" id="img_id261663429176807" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id91663329174808">Gray arrow down</alt></image>
+ </paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id31494142" role="listitem">3 - flags</paragraph>
+ <paragraph role="paragraph" id="par_id101663433624185" xml-lang="en-US">
+ <image src="media/icon-themes/sc/res/icon-set-flags-yellow.svg" id="img_id261663429174807" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id91663429174808">Yellow flag</alt></image>
+ <image src="media/icon-themes/sc/res/icon-set-flags-red.svg" id="img_id261663429176807" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id91663529174808">Red flag</alt></image>
+ <image src="media/icon-themes/sc/res/icon-set-flags-green.svg" id="img_id261663429176807" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id91663529174808">Green flag</alt></image>
+ </paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id31494143" role="listitem">3 - traffic lights 1 and 2 (two different designs)</paragraph>
+ <paragraph role="paragraph" id="par_id721663433917655" xml-lang="en-US">
+ <image src="media/icon-themes/sc/res/icon-set-circles1-yellow.svg" id="img_id261663429174807" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id91663429174808">Yellow traffic light 1</alt></image>
+ <image src="media/icon-themes/sc/res/icon-set-circles1-red.svg" id="img_id261663429176807" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id91663529174808">Red traffic light 1</alt></image>
+ <image src="media/icon-themes/sc/res/icon-set-circles1-green.svg" id="img_id261663429176807" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id91663529174808">Green traffic light 1</alt></image>
+ </paragraph>
+ <paragraph role="paragraph" id="par_id501663433925207" xml-lang="en-US">
+ <image src="media/icon-themes/sc/res/icon-set-trafficlights-yellow.svg" id="img_id261663429174807" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id91663429174808">Yellow traffic light 2</alt></image>
+ <image src="media/icon-themes/sc/res/icon-set-trafficlights-red.svg" id="img_id261663429176807" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id91663529174808">Red traffic light 2</alt></image>
+ <image src="media/icon-themes/sc/res/icon-set-trafficlights-green.svg" id="img_id261663429176807" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id91663529174808">Green traffic light 2</alt></image>
+ </paragraph>
+ </listitem>
+ <listitem>
+ <paragraph id="par_id701663438522480" role="listitem">3 - Smileys 1 and 2</paragraph>
+ <paragraph role="paragraph" id="par_id991663438568052">
+ <image src="media/icon-themes/sc/res/icon-set-positive-yellow-smilie.svg" id="img_id261663429174807" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id91663429174808">Yellow positive smiley</alt></image>
+ <image src="media/icon-themes/sc/res/icon-set-neutral-yellow-smilie.svg" id="img_id261663429176807" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id91663529174808">Yellow neutral smiley</alt></image>
+ <image src="media/icon-themes/sc/res/icon-set-negative-yellow-smilie.svg" id="img_id261663429176807" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id91663529174808">Yellow negative smiley</alt></image>
+ </paragraph>
+ <paragraph role="paragraph" id="par_id991663438966721" xml-lang="en-US">
+ <image src="media/icon-themes/sc/res/icon-set-positive-green-smilie.svg" id="img_id261663429174807" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id91663429174808">Green positive smiley</alt></image>
+ <image src="media/icon-themes/sc/res/icon-set-neutral-yellow-smilie.svg" id="img_id261663429176807" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id91663529174808">Yellow neutral smiley</alt></image>
+ <image src="media/icon-themes/sc/res/icon-set-negative-red-smilie.svg" id="img_id261663429176807" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id91663529174808">Red negative smiley</alt></image>
+ </paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id31494144" role="listitem">3 - symbols </paragraph>
+ <paragraph role="paragraph" id="par_id421663434453517" xml-lang="en-US">
+ <image src="media/icon-themes/sc/res/icon-set-shapes-triangle.svg" id="img_id261663429176807" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id91663529174808">Shape triangle</alt></image>
+ <image src="media/icon-themes/sc/res/icon-set-shapes-diamond.svg" id="img_id261663429176807" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id91663529174808">Shape diamond</alt></image>
+ <image src="media/icon-themes/sc/res/icon-set-shapes-circle.svg" id="img_id261663429176807" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id91663529174808">Shape circle</alt></image>
+ </paragraph>
+ <paragraph role="paragraph" id="par_id961663439450424" xml-lang="en-US">
+ <image src="media/icon-themes/sc/res/icon-set-symbols1-exclamation-mark.svg" id="img_id261663429176807" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id91663529174808">Exclamation mark</alt></image>
+ <image src="media/icon-themes/sc/res/icon-set-symbols1-cross.svg" id="img_id261663429176807" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id91663529174808">Cross</alt></image>
+ <image src="media/icon-themes/sc/res/icon-set-symbols1-check.svg" id="img_id261663429176807" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id91663529174808">Check mark</alt></image>
+ </paragraph>
+ <paragraph role="paragraph" id="par_id1001663439805133" xml-lang="en-US">
+ <image src="media/icon-themes/sc/res/icon-set-stars-empty.svg" id="img_id261663429176807" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id91663529174808">Empty star</alt></image>
+ <image src="media/icon-themes/sc/res/icon-set-stars-half.svg" id="img_id261663429176807" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id91663529174808">Half star</alt></image>
+ <image src="media/icon-themes/sc/res/icon-set-stars-full.svg" id="img_id261663429176807" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id91663529174808">Full star</alt></image>
+ </paragraph>
+ <paragraph role="paragraph" id="par_id171663440020964" xml-lang="en-US">
+ <image src="media/icon-themes/sc/res/icon-set-triangles-up.svg" id="img_id261663429176807" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id91663529174808">Triangle up</alt></image>
+ <image src="media/icon-themes/sc/res/icon-set-triangles-same.svg" id="img_id261663429176807" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id91663529174808">Same</alt></image>
+ <image src="media/icon-themes/sc/res/icon-set-triangles-down.svg" id="img_id261663429176807" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id91663529174808">Triangle down</alt></image>
+ </paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id31494145" role="listitem">4 - circles from red to black</paragraph>
+ <paragraph role="paragraph" id="par_id481663434995022" xml-lang="en-US">
+ <image src="media/icon-themes/sc/res/icon-set-circles2-dark-red.svg" id="img_id261663429174807" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id91663429174808">Dark red</alt></image>
+ <image src="media/icon-themes/sc/res/icon-set-circles2-light-red.svg" id="img_id261663429174807" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id91663429174808">Light red</alt></image>
+ <image src="media/icon-themes/sc/res/icon-set-circles2-light-gray.svg" id="img_id261663429174807" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id91663429174808">Light gray</alt></image>
+ <image src="media/icon-themes/sc/res/icon-set-circles2-dark-gray.svg" id="img_id261663429174807" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id91663429174808">Dark gray</alt></image>
+ </paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id31494146" role="listitem">4 or 5 - ratings</paragraph>
+ <paragraph role="paragraph" id="par_id631663435728155" xml-lang="en-US">
+ <image src="media/icon-themes/sc/res/icon-set-bars-empty.svg" id="img_id261663429174807" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id91663429174808">Empty bars</alt></image>
+ <image src="media/icon-themes/sc/res/icon-set-bars-one-quarter.svg" id="img_id261663429174807" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id91663429174808">One quarters bars</alt></image>
+ <image src="media/icon-themes/sc/res/icon-set-bars-half.svg" id="img_id261663429174807" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id91663429174808">Half bars</alt></image>
+ <image src="media/icon-themes/sc/res/icon-set-bars-three-quarters.svg" id="img_id261663429174807" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id91663429174808">Three quarters bars</alt></image>
+ <image src="media/icon-themes/sc/res/icon-set-bars-full.svg" id="img_id261663429174807" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id91663429174808">Full bars</alt></image>
+ </paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id31494147" role="ilistitem">5 - quarters</paragraph>
+ <paragraph role="paragraph" id="par_id741663436015689" xml-lang="en-US">
+ <image src="media/icon-themes/sc/res/icon-set-pies-empty.svg" id="img_id261663429174807" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id91663429174808">Empty</alt></image>
+ <image src="media/icon-themes/sc/res/icon-set-pies-one-quarter.svg" id="img_id261663429174807" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id91663429174808">One quarter</alt></image>
+ <image src="media/icon-themes/sc/res/icon-set-pies-half.svg" id="img_id261663429174807" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id91663429174808">Half</alt></image>
+ <image src="media/icon-themes/sc/res/icon-set-pies-three-quarters.svg" id="img_id261663429174807" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id91663429174808">Three quarters</alt></image>
+ <image src="media/icon-themes/sc/res/icon-set-pies-full.svg" id="img_id261663429174807" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id91663429174808">Full</alt></image>
+ </paragraph>
+ </listitem>
+ <listitem>
+ <paragraph id="par_id821663436639070" role="listitem">5 - boxes</paragraph>
+ <paragraph role="paragraph" id="par_id811663438472751" xml-lang="en-US">
+ <image src="media/icon-themes/sc/res/icon-set-squares-empty.svg" id="img_id261663429174807" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id91663429174808">Empty</alt></image>
+ <image src="media/icon-themes/sc/res/icon-set-squares-one-quarter.svg" id="img_id261663429174807" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id91663429174808">One quarter</alt></image>
+ <image src="media/icon-themes/sc/res/icon-set-squares-half.svg" id="img_id261663429174807" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id91663429174808">Half</alt></image>
+ <image src="media/icon-themes/sc/res/icon-set-squares-three-quarters.svg" id="img_id261663429174807" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id91663429174808">Three quarters</alt></image>
+ <image src="media/icon-themes/sc/res/icon-set-squares-full.svg" id="img_id261663429174807" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id91663429174808">Full</alt></image>
+ </paragraph>
+ </listitem>
+ </list>
+ <h3 id="hd_id621663440395987">Conditions for thresholds</h3>
+ <paragraph xml-lang="en-US" id="par_id3153765" role="paragraph">Conditions to set the thresholds for each icon can be specified as follows</paragraph>
+ <embed href="text/scalc/01/05120400.xhp#commonconditions"/>
+ <embed href="text/scalc/06/calcsamplefiles.xhp#conditionalformatting"/>
+ <section id="relatedtopics">
+ <paragraph xml-lang="en-US" id="par_id3155606" role="paragraph"><link href="https://wiki.documentfoundation.org/Faq/Calc/141">How to use Icon Set Conditional Formatting page</link> in TDF Wiki.</paragraph>
+ <paragraph role="paragraph" id="par_id651663598549283"><link href="https://wiki.documentfoundation.org/Faq/Calc/142">How to apply a Color Scale Conditional Formatting page</link> in TDF Wiki.</paragraph>
+ </section>
+</body>
+</helpdocument>
diff --git a/source/text/scalc/01/05120500.xhp b/source/text/scalc/01/05120500.xhp
new file mode 100644
index 000000000..6706c1c2f
--- /dev/null
+++ b/source/text/scalc/01/05120500.xhp
@@ -0,0 +1,36 @@
+<?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="conditionalformattingmanage" indexer="include" status="PUBLISH">
+ <title id="tit" xml-lang="en-US">Conditional Formatting - Manage Conditions</title>
+ <filename>/text/scalc/01/05120500.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/condformatmanager/CondFormatManager" id="bm_id3152598" localize="false"/>
+ <bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/condformatmanager/@@nowidget@@" id="bm_id3152598" localize="false"/>
+ <section id="manageconditions">
+ <h1 id="hd_id391662937414401"><variable id="h1"><link href="text/scalc/01/05120500.xhp" name="Manage Conditions">Manage Conditions</link></variable></h1>
+ <paragraph xml-lang="en-US" id="par_id3155906" role="paragraph">Manage all the conditional formatting defined in the spreadsheet.</paragraph>
+ </section>
+ <section id="howtoget">
+ <embed href="text/scalc/00/00000405.xhp#s_conditionalmanage"/>
+ </section>
+ <paragraph xml-lang="en-US" id="par_id3155907" role="paragraph">The <emph>Manage Conditional Formatting</emph> dialog is where you can add, edit or delete one or several conditional formattings.</paragraph>
+
+ <bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/condformatmanager/CONTAINER" id="bm_id3152603" localize="false"/>
+ <paragraph xml-lang="en-US" id="par_id3155909" role="paragraph">The <emph>Conditional Formats</emph> list displays the active conditional formatting rules set in the current spreadsheet. Only the first rule for each cell range is listed, even if there are multiple rules defined for a given range.</paragraph>
+
+ <paragraph xml-lang="en-US" id="par_id3155908" role="paragraph">If you have defined a conditional formatting on a cell range and you try now to define a new conditional formatting on a part of this range, a warning message will be displayed, asking if you want to edit the existing conditional formatting (on the whole range) or define a new conditional formatting overlapping it (on the selected range).</paragraph>
+
+</body>
+</helpdocument>
diff --git a/source/text/scalc/01/cell_styles.xhp b/source/text/scalc/01/cell_styles.xhp
index eb5780668..4c67ec43e 100644
--- a/source/text/scalc/01/cell_styles.xhp
+++ b/source/text/scalc/01/cell_styles.xhp
@@ -22,7 +22,7 @@
</section>
<section id="howtoget">
-
+<embed href="text/shared/00/00040500.xhp#stylewindow"/>
</section>
<embed href="text/shared/01/05040100.xhp#organizer"/>
<embed href="text/shared/01/05020300.xhp#numbersh1"/>
diff --git a/source/text/scalc/06/calcsamplefiles.xhp b/source/text/scalc/06/calcsamplefiles.xhp
index 40dc41adc..a31061bee 100644
--- a/source/text/scalc/06/calcsamplefiles.xhp
+++ b/source/text/scalc/06/calcsamplefiles.xhp
@@ -29,5 +29,8 @@
<section id="func_fourier">
<paragraph role="paragraph" id="par_id591561765191143" localize="false"><object data="media/files/scalc/function_fourier.ods" id="ods_id61521525603534" type="application/vnd.oasis.opendocument.spreadsheet" /></paragraph>
</section>
+ <section id="conditionalformatting">
+ <paragraph role="paragraph" id="par_id591563765191143" localize="false"><object data="media/files/scalc/conditionalformatting.ods" id="ods_id61521525603534" type="application/vnd.oasis.opendocument.spreadsheet" /></paragraph>
+ </section>
</body>
</helpdocument>
diff --git a/source/text/scalc/guide/value_with_name.xhp b/source/text/scalc/guide/value_with_name.xhp
index 5a82195f7..1822b2f66 100644
--- a/source/text/scalc/guide/value_with_name.xhp
+++ b/source/text/scalc/guide/value_with_name.xhp
@@ -44,22 +44,16 @@
<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" name="Naming Cells">Naming Cells</link>
</variable></paragraph>
<paragraph xml-lang="en-US" id="hd_id4391918" role="heading" level="2">Allowed names</paragraph>
- <paragraph xml-lang="en-US" id="par_id2129581" role="paragraph">Names in Calc can contain letters, numeric characters, and some special characters. Names must start with a letter or an underline character.</paragraph>
+ <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>
<list type="unordered">
<listitem>
<paragraph xml-lang="en-US" id="par_id3362224" role="paragraph">underline (_) </paragraph>
</listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id4891506" role="paragraph">period (.) - allowed within a name, but not as first or last character</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id2816553" role="paragraph">blank ( ) - allowed within a name, but not as first or last character, and not for a cell range</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 single cells, sheets and documents.</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 xml-lang="en-US" id="hd_id1226233" role="heading" level="2">Naming cells and formulas</paragraph>
<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>
diff --git a/source/text/sdatabase/dabaadvpropdat.xhp b/source/text/sdatabase/dabaadvpropdat.xhp
index bfe2fa07b..1bbdbeb99 100644
--- a/source/text/sdatabase/dabaadvpropdat.xhp
+++ b/source/text/sdatabase/dabaadvpropdat.xhp
@@ -78,7 +78,7 @@
<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/specialsettingspage/usecatalogname" id="bm_id2444532" localize="false"/>
<h2 id="par_idN105FA">Use the catalog name in SELECT statements</h2>
- <paragraph xml-lang="en-US" id="par_idN105FE" role="paragraph"><ahelp hid=".">Uses the current data source of the catalog. This option is useful when the ODBC data source is a database server. Do not select this option if the ODBC data source is a dBASE driver.</ahelp><comment>copie from shared\explorer\database\11020000.xhp</comment></paragraph>
+ <paragraph xml-lang="en-US" id="par_idN105FE" role="paragraph"><ahelp hid=".">Uses the current data source of the catalog. This option is useful when the ODBC data source is a database server. Do not select this option if the ODBC data source is a dBASE driver.</ahelp><comment>copied from shared\explorer\database\11020000.xhp</comment></paragraph>
<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/specialsettingspage/useschemaname" id="bm_id7354655" localize="false"/>
<h2 id="par_idN10613">Use the schema name in SELECT statements</h2>
diff --git a/source/text/sdatabase/dabawiz00.xhp b/source/text/sdatabase/dabawiz00.xhp
index 3451a0b5a..7c8fb92d5 100644
--- a/source/text/sdatabase/dabawiz00.xhp
+++ b/source/text/sdatabase/dabawiz00.xhp
@@ -41,6 +41,7 @@
</bookmark><comment>mw added "(Base)" to all entries</comment>
<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/generalpagewizard/PageGeneral" id="bm_id3952452" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/generalpagewizard/@@nowidget@@" id="bm_id4952452" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_DBWIZ_ROADMAP" id="bm_id651663793407710" localize="false"/>
<h1 id="par_idN105B4"><variable id="databasewizardh1"><link href="text/sdatabase/dabawiz00.xhp">Database Wizard</link></variable></h1>
<paragraph role="paragraph" id="par_id9856563" xml-lang="en-US">The Database Wizard creates a <link href="text/sdatabase/dabadoc.xhp">database file</link> that contains information about a database.</paragraph>
</section>
diff --git a/source/text/shared/00/00000002.xhp b/source/text/shared/00/00000002.xhp
index 0cfbc9b60..b54a974f9 100644
--- a/source/text/shared/00/00000002.xhp
+++ b/source/text/shared/00/00000002.xhp
@@ -190,7 +190,7 @@
<h2 id="hd_id3150751" xml-lang="en-US">Tags</h2>
-<paragraph id="par_id3156360" role="paragraph" xml-lang="en-US"><link href="text/shared/00/00000002.xhp#html" name="HTML">HTML</link> pages contain certain structural and formatting instructions called tags. Tags are code words enclosed by brackets in the document description language HTML. Many tags contain text or hyperlink references between the opening and closing brackets. For example, titles are marked by the tags &lt;h1&gt; at the beginning and &lt;/h1&gt; at the end of the title. Some tags only appear on their own such as &lt;br&gt; for a line break or &lt;img ...&gt; to link a graphic.</paragraph>
+<paragraph id="par_id3156360" role="paragraph" xml-lang="en-US"><link href="text/shared/00/00000002.xhp#html" name="HTML">HTML</link> pages contain certain structural and formatting instructions called tags. Tags are code words enclosed by brackets in the document description language HTML. Many tags contain text or hyperlink references between the opening and closing brackets. For example, titles are marked by the tags &lt; h1 &gt; at the beginning and &lt; /h1 &gt; at the end of the title. Some tags only appear on their own such as &lt; br &gt; for a line break or &lt; img ... &gt; to link a graphic.</paragraph>
</section>
<section id="url">
diff --git a/source/text/shared/00/00000007.xhp b/source/text/shared/00/00000007.xhp
index d657f88ab..1b5236c22 100644
--- a/source/text/shared/00/00000007.xhp
+++ b/source/text/shared/00/00000007.xhp
@@ -1,6 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
<!--
* This file is part of the LibreOffice project.
*
@@ -18,8 +16,6 @@
* 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="textshared0000000007xml" indexer="exclude" status="PUBLISH">
@@ -31,7 +27,7 @@
</history>
</meta>
<body>
-<paragraph role="heading" id="hd_id3155620" xml-lang="en-US" level="1">Toolbars</paragraph>
+<h1 id="hd_id3155620">Toolbars</h1>
<paragraph role="paragraph" id="par_id3152823" xml-lang="en-US"><variable id="werkzeugleiste">Icon on the Tools bar:
</variable></paragraph>
<paragraph role="paragraph" id="par_id3152352" xml-lang="en-US"><variable id="textobjektleiste">Icon on the Formatting Bar:
@@ -43,7 +39,7 @@
<paragraph role="paragraph" id="par_id3156553" xml-lang="en-US"><variable id="symbolleistenneu">This overview describes the default toolbar configuration for $[officename].
</variable></paragraph>
<section id="asia">
-<paragraph role="heading" id="par_id3153551" xml-lang="en-US" level="2">Asian Language Support</paragraph>
+<h2 id="par_id3153551">Asian Language Support</h2>
<section id="asia_note">
<paragraph role="paragraph" id="par_id3156326" xml-lang="en-US">These commands can only be accessed after you enable support for Asian languages in <switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph></caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - Language Settings - Languages</emph>.</paragraph>
</section>
diff --git a/source/text/shared/00/00000406.xhp b/source/text/shared/00/00000406.xhp
index 901af13de..216851285 100644
--- a/source/text/shared/00/00000406.xhp
+++ b/source/text/shared/00/00000406.xhp
@@ -87,7 +87,7 @@
<paragraph xml-lang="en-US" id="par_id3153320" role="paragraph">Choose <emph>Tools - Color Replacer</emph> ($[officename] Draw and $[officename] Impress).</paragraph>
</section>
<paragraph xml-lang="en-US" id="par_idN107E9" role="paragraph"><variable id="mediaplayer">Choose <emph>Tools - Media Player</emph>.</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3151385" role="paragraph"><variable id="makro">Choose <emph>Tools - Macros - Organize Macros - %PRODUCTNAME Basic</emph>, or press <switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline>+F11 (if not assigned by your system).</variable></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3151385" role="paragraph"><variable id="makro">Choose <emph>Tools - Macros - Organize Macros - Basic</emph>, or press <switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline>+F11 (if not assigned by your system).</variable></paragraph>
<paragraph xml-lang="en-US" id="par_id3151386" role="paragraph"><variable id="selectmakro">Choose <emph>Tools - Macros - Run Macro</emph>.</variable></paragraph>
<paragraph role="paragraph" id="par_id511543350796749" xml-lang="en-US"><variable id="beanshell">Choose <emph>Tools - Macros - Organize Macros - BeanShell</emph>.</variable></paragraph>
<paragraph role="paragraph" id="par_id661543350803067" xml-lang="en-US"><variable id="javascript">Choose <emph>Tools - Macros - Organize Macros - JavaScript</emph>.</variable></paragraph>
@@ -95,8 +95,8 @@
<section id="recordmacro">
<paragraph xml-lang="en-US" id="par_id3149456" role="paragraph">Choose <emph>Tools - Macros - Record Macro</emph>.</paragraph>
</section>
- <paragraph xml-lang="en-US" id="par_id3150398" role="paragraph"><variable id="passwort">Choose <emph>Tools - Macros - Organize Macros - %PRODUCTNAME Basic</emph>,<br/>click the <emph>Organizer</emph> button,<br/>click the <emph>Libraries</emph> tab,<br/>and then click the <emph>Password</emph> button.</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3150498" role="paragraph"><variable id="liborganizer">Choose <emph>Tools - Macros - Organize Macros - %PRODUCTNAME Basic</emph>,<br/>click the <widget>Organizer</widget> button.</variable></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150398" role="paragraph"><variable id="passwort">Choose <emph>Tools - Macros - Organize Macros - Basic</emph>,<br/>click the <emph>Organizer</emph> button,<br/>click the <emph>Libraries</emph> tab,<br/>and then click the <emph>Password</emph> button.</variable></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150498" role="paragraph"><variable id="liborganizer">Choose <emph>Tools - Macros - Organize Macros - Basic</emph>,<br/>click the <widget>Organizer</widget> button.</variable></paragraph>
<paragraph xml-lang="en-US" id="par_idN10843" role="paragraph"><variable id="packagemanager">Choose <emph>Tools - Extension Manager</emph>.</variable></paragraph>
<paragraph xml-lang="en-US" id="par_id9988402" role="paragraph"><variable id="packagemanager_eu">Choose <emph>Tools - Extension Manager</emph>, click <emph>Check for Updates</emph> button.</variable></paragraph>
<paragraph xml-lang="en-US" id="par_id3151106" role="paragraph"><variable id="xmlfilter">Choose <menuitem>Tools - Macros - XML Filter Settings</menuitem>.</variable></paragraph>
@@ -104,8 +104,8 @@
<paragraph xml-lang="en-US" id="par_id3148979" role="paragraph"><variable id="xmlfiltertest"><menuitem>Tools - Macros - XML Filter Settings</menuitem>, then click <emph>Test XSLTs</emph>.</variable></paragraph>
<paragraph xml-lang="en-US" id="par_id3148672" role="paragraph"><variable id="anpassen">Choose <emph>Tools - Customize</emph>.</variable></paragraph>
<paragraph xml-lang="en-US" id="par_id3147230" role="paragraph"><variable id="menue">Choose <emph>Tools - Customize - Menus</emph> tab.</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_idN108E9" role="paragraph"><variable id="menuenew">Choose <menuitem>Tools - Customize - Menus</menuitem> tab, click the gear <image id="img_id3148386" src="cmd/lc_config.svg" width="1cm" height="1cm"><alt id="alt_id3148386" xml-lang="en-US">Icon gear menu</alt></image> dropdown menu and choose <menuitem>Add</menuitem>.</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_idN10919" role="paragraph"><variable id="menuemove">Choose <menuitem>Tools - Customize - Menus</menuitem> tab, click the gear <image id="img_id3148386" src="cmd/lc_config.svg" width="1cm" height="1cm"><alt id="alt_id3148386" xml-lang="en-US">Icon gear menu</alt></image> dropdown menu and choose <menuitem>Move</menuitem>.</variable></paragraph>
+ <paragraph xml-lang="en-US" id="par_idN108E9" role="paragraph"><variable id="menuenew">Choose <menuitem>Tools - Customize - Menus</menuitem> tab, click the hamburger <image id="img_id3148386" src="sfx2/res/menu.svg" width="1cm" height="1cm"><alt id="alt_id3148386" xml-lang="en-US">Icon Hamburger menu</alt></image> dropdown menu and choose <menuitem>Add</menuitem>.</variable></paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10919" role="paragraph"><variable id="menuemove">Choose <menuitem>Tools - Customize - Menus</menuitem> tab, click the hamburger <image id="img_id3148386" src="sfx2/res/menu.svg" width="1cm" height="1cm"><alt id="alt_id3148386" xml-lang="en-US">Icon Hamburger menu</alt></image> dropdown menu and choose <menuitem>Move</menuitem>.</variable></paragraph>
<paragraph xml-lang="en-US" id="par_id3145171" role="paragraph"><variable id="keyboard">Choose <menuitem>Tools - Customize - Keyboard</menuitem> tab. A document must be opened.</variable></paragraph>
<paragraph xml-lang="en-US" id="par_id3153968" role="paragraph"><variable id="symbole">Choose <menuitem>Tools - Customize - Toolbars</menuitem> tab.</variable></paragraph>
<paragraph xml-lang="en-US" id="par_id3144432" role="paragraph"><variable id="events">Choose <menuitem>Tools - Customize - Events</menuitem> tab.</variable></paragraph>
diff --git a/source/text/shared/01/05020100.xhp b/source/text/shared/01/05020100.xhp
index 521c85517..d58acf3a9 100644
--- a/source/text/shared/01/05020100.xhp
+++ b/source/text/shared/01/05020100.xhp
@@ -99,7 +99,7 @@
<h2 id="hd_id3151176">Language</h2>
<paragraph role="paragraph" id="par_id3157961" xml-lang="en-US"><ahelp hid="cui/ui/charnamepage/ctllanglb">Sets the language that the spellchecker uses for the selected text or the text that you type. Available language modules have a check mark in front of them.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id3157962" xml-lang="en-US">If the language list consists of an editable combo box, you can enter a valid <emph>BCP 47 language tag</emph> if the language you want to assign is not available from the selectable list.</paragraph>
-<paragraph role="paragraph" id="par_id3157963" xml-lang="en-US">For language tag details please see the <link href="http://www.langtag.net/"><emph>For users</emph> section on the langtag.net web site</link>.</paragraph>
+<paragraph role="paragraph" id="par_id3157963" xml-lang="en-US">For language tag details please see the <link href="https://en.wikipedia.org/wiki/IETF_language_tag">IETF language tag</link> Wikipedia page and the W3C <link href="https://www.w3.org/International/articles/language-tags/">Language tags in HTML and XML</link> article.</paragraph>
<switch select="appl">
<case select="CALC">
<note id="par_id3153770">You can also change the locale setting for cells (choose <emph>Format - Cells - Numbers</emph>).</note>
diff --git a/source/text/shared/01/05030500.xhp b/source/text/shared/01/05030500.xhp
index 8053f617d..cc696c88c 100644
--- a/source/text/shared/01/05030500.xhp
+++ b/source/text/shared/01/05030500.xhp
@@ -38,7 +38,8 @@
<embed href="text/shared/00/00040500.xhp#borders"/>
</section>
<switch select="appl">
- <case select="WRITER"><tip id="par_id3152997" xml-lang="en-US">To modify the border of an entire table, place the cursor in a table cell, right-click, choose <emph>Table</emph>, and then click the <emph>Borders</emph> tab. To modify the border of a table cell, select the cell, right-click, choose <emph>Table</emph>, and then click the <emph>Borders</emph> tab.</tip>
+ <case select="WRITER">
+ <tip id="par_id3152997" xml-lang="en-US">To modify the border of an entire table, place the cursor in a table cell, right-click, choose <emph>Table</emph>, and then click the <emph>Borders</emph> tab. To modify the border of a table cell, select the cell, right-click, choose <emph>Table</emph>, and then click the <emph>Borders</emph> tab.</tip>
</case>
</switch>
<bookmark xml-lang="en-US" branch="hid/cui/ui/borderpage/presets" id="bm_id3159157" localize="false"/>
@@ -53,44 +54,56 @@
<tip id="par_id181630450040456">Read the help page <link href="text/scalc/guide/borders.xhp">User Defined Borders in Cells</link> to learn more on how to define custom line arrangements.</tip>
</case>
</switch>
-<bookmark xml-lang="en-US" branch="hid/cui/ui/borderpage/linestylelb" id="bm_id3153896" localize="false"/><paragraph role="heading" id="hd_id3149575" xml-lang="en-US" level="2">Line</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/borderpage/linestylelb" id="bm_id3153896" localize="false"/>
+<h2 id="hd_id3149575">Line</h2>
<paragraph role="paragraph" id="par_id3152360" xml-lang="en-US"><ahelp hid="cui/ui/borderpage/linestylelb">Click the border style that you want to apply. The style is applied to the borders selected in the preview.</ahelp></paragraph>
<embed href="text/shared/00/00000007.xhp#objektleiste"/>
<embed href="text/shared/02/03140000.xhp#syline_style"/>
<bookmark xml-lang="en-US" branch="hid/cui/ui/borderpage/linecolorlb" id="bm_id3154072" localize="false"/><paragraph role="paragraph" id="par_id3154938" xml-lang="en-US"><ahelp hid="cui/ui/borderpage/linecolorlb">Select the line color that you want to use for the selected border(s).</ahelp></paragraph>
<h2 id="hd_id3150359" xml-lang="en-US">Padding</h2>
<paragraph role="paragraph" id="par_id3154365" xml-lang="en-US">Specify the amount of space that you want to leave between the border and the contents of the selection.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui/ui/borderpage/leftmf" id="bm_id3154819" localize="false"/><paragraph role="heading" id="hd_id3147084" xml-lang="en-US" level="3">Left</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/borderpage/leftmf" id="bm_id3154819" localize="false"/>
+<h3 id="hd_id3147084">Left</h3>
<paragraph role="paragraph" id="par_id3151176" xml-lang="en-US"><ahelp hid="cui/ui/borderpage/leftmf">Enter the distance that you want to have between the left border and the contents of the selection.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui/ui/borderpage/rightmf" id="bm_id3143231" localize="false"/><paragraph role="heading" id="hd_id3150650" xml-lang="en-US" level="3">Right</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/borderpage/rightmf" id="bm_id3143231" localize="false"/>
+<h3 id="hd_id3150650">Right</h3>
<paragraph role="paragraph" id="par_id3153104" xml-lang="en-US"><ahelp hid="cui/ui/borderpage/rightmf">Enter the distance that you want to have between the right border and the contents of the selection.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui/ui/borderpage/topmf" id="bm_id3151380" localize="false"/><paragraph role="heading" id="hd_id3150495" xml-lang="en-US" level="3">Top</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/borderpage/topmf" id="bm_id3151380" localize="false"/>
+<h3 id="hd_id3150495">Top</h3>
<paragraph role="paragraph" id="par_id3156212" xml-lang="en-US"><ahelp hid="cui/ui/borderpage/topmf">Enter the distance that you want to have between the top border and the contents of the selection.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui/ui/borderpage/bottommf" id="bm_id3148451" localize="false"/><paragraph role="heading" id="hd_id3150767" xml-lang="en-US" level="3">Bottom</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/borderpage/bottommf" id="bm_id3148451" localize="false"/>
+<h3 id="hd_id3150767">Bottom</h3>
<paragraph role="paragraph" id="par_id3158410" xml-lang="en-US"><ahelp hid="cui/ui/borderpage/bottommf">Enter the distance that you want to have between the bottom border and the contents of the selection.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui/ui/borderpage/sync" id="bm_id3157893" localize="false"/><paragraph role="heading" id="hd_id3155429" xml-lang="en-US" level="3">Synchronize</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/borderpage/sync" id="bm_id3157893" localize="false"/>
+<h3 id="hd_id3155429">Synchronize</h3>
<paragraph role="paragraph" id="par_id3154299" xml-lang="en-US"><ahelp hid="cui/ui/borderpage/sync">Applies the same <emph>padding</emph> setting to all four borders when you enter a new distance.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="index" id="bm_id3155855"><bookmark_value>shadows; borders</bookmark_value>
+<bookmark xml-lang="en-US" branch="index" id="bm_id3155855">
+<bookmark_value>shadows; borders</bookmark_value>
<bookmark_value>borders; shadows</bookmark_value>
<bookmark_value>margins; shadows</bookmark_value>
</bookmark>
-<paragraph role="heading" id="hd_id3155855" xml-lang="en-US" level="2">Shadow style</paragraph>
+<h2 id="hd_id3155855">Shadow style</h2>
<paragraph role="paragraph" id="par_id3146975" xml-lang="en-US">You can also apply a shadow effect to borders. For the best results, only apply this effect when all four borders are visible.</paragraph>
-<paragraph role="note" id="par_id3157309" xml-lang="en-US">Graphics or objects that are anchored to a frame in the document cannot exceed the size of the frame. If you apply a shadow to the borders of an object that fills an entire frame, the size of the object is reduced to display the shadows.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui/ui/borderpage/shadows" id="bm_id3154321" localize="false"/><paragraph role="heading" id="hd_id3153728" xml-lang="en-US" level="3">Position</paragraph>
+<note id="par_id3157309">Graphics or objects that are anchored to a frame in the document cannot exceed the size of the frame. If you apply a shadow to the borders of an object that fills an entire frame, the size of the object is reduced to display the shadows.</note>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/borderpage/shadows" id="bm_id3154321" localize="false"/>
+<h3 id="hd_id3153728">Position</h3>
<paragraph role="paragraph" id="par_id3153364" xml-lang="en-US"><ahelp hid="cui/ui/borderpage/shadows">Click a shadow style for the selected borders.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui/ui/borderpage/distancemf" id="bm_id3152576" localize="false"/><paragraph role="heading" id="hd_id3156444" xml-lang="en-US" level="3">Distance</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/borderpage/distancemf" id="bm_id3152576" localize="false"/>
+<h3 id="hd_id3156444">Distance</h3>
<paragraph role="paragraph" id="par_id3156060" xml-lang="en-US"><ahelp hid="cui/ui/borderpage/distancemf">Enter the width of the shadow.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui/ui/borderpage/shadowcolorlb" id="bm_id3152463" localize="false"/><paragraph role="heading" id="hd_id3155307" xml-lang="en-US" level="3">Color</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/borderpage/shadowcolorlb" id="bm_id3152463" localize="false"/>
+<h3 id="hd_id3155307">Color</h3>
<paragraph role="paragraph" id="par_id3146147" xml-lang="en-US"><ahelp hid="cui/ui/borderpage/shadowcolorlb">Select a color for the shadow.</ahelp></paragraph>
<switch select="appl">
-<case select="WRITER"><paragraph role="heading" id="par_idN10A2B" xml-lang="en-US" level="2">Properties</paragraph>
+<case select="WRITER"><h2 id="par_idN10A2B">Properties</h2>
<paragraph role="paragraph" id="par_idN10A2F" xml-lang="en-US">Specifies the properties for the current paragraph or the selected paragraphs.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui/ui/borderpage/mergewithnext" id="bm_id177312" localize="false"/><paragraph role="heading" id="par_idN10A3A" xml-lang="en-US" level="3">Merge with next paragraph</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/borderpage/mergewithnext" id="bm_id177312" localize="false"/>
+<h3 id="par_idN10A3A">Merge with next paragraph</h3>
<paragraph role="paragraph" id="par_idN10A3E" xml-lang="en-US"><ahelp hid="cui/ui/borderpage/mergewithnext">Merges the border style and the shadow style of the current paragraph with the next paragraph.</ahelp> These styles are only merged if the indent, border, and shadow styles of the next paragraph are the same as the current paragraph. This option is also available for Paragraph Styles.<comment>UFI: see spec "spec-merge-borders-and-shadow"</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui/ui/borderpage/mergeadjacent" id="bm_id678731" localize="false"/><paragraph role="heading" id="par_idN109BA" xml-lang="en-US" level="3">Merge adjacent line styles</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/borderpage/mergeadjacent" id="bm_id678731" localize="false"/>
+<h3 id="par_idN109BA">Merge adjacent line styles</h3>
<paragraph role="paragraph" id="par_idN109BE" xml-lang="en-US"><ahelp hid="cui/ui/borderpage/mergeadjacent">Merges two different border styles of adjacent cells in a Writer table into one border style. This property is valid for a whole table in a Writer document.</ahelp></paragraph>
-<paragraph role="note" id="par_idN109C1" xml-lang="en-US">The rules can be condensed to the statement that the stronger attribute wins. If, for example, one cell has a red border of 2 point width, and the adjacent cell has a blue border of 3 point width, then the common border between these two cells will be blue with 3 point width.<comment>UFI: see spec "collapsing_table_borders"</comment></paragraph>
+<note id="par_idN109C1">The rules can be condensed to the statement that the stronger attribute wins. If, for example, one cell has a red border of 2 point width, and the adjacent cell has a blue border of 3 point width, then the common border between these two cells will be blue with 3 point width.<comment>UFI: see spec "collapsing_table_borders"</comment></note>
</case>
</switch>
<embed href="text/shared/00/00000001.xhp#reset"/>
diff --git a/source/text/shared/01/06140100.xhp b/source/text/shared/01/06140100.xhp
index 201758a87..336a98d1c 100644
--- a/source/text/shared/01/06140100.xhp
+++ b/source/text/shared/01/06140100.xhp
@@ -53,23 +53,23 @@
<paragraph role="paragraph" id="par_id921514303969718" xml-lang="en-US"><ahelp hid=".">Select the menu where the customization is to be applied.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/cui/ui/menuassignpage/plusbtn" id="bm_id714747" localize="false"/>
<h3 id="hd_id351514304283480" xml-lang="en-US">Add</h3>
- <paragraph role="paragraph" id="par_id151514304300251" xml-lang="en-US"><ahelp hid=".">Click on the gear icon and then choose Add to add a new menu.</ahelp></paragraph>
+ <paragraph role="paragraph" id="par_id151514304300251" xml-lang="en-US"><ahelp hid=".">Click on the hamburger icon and then choose Add to add a new menu.</ahelp></paragraph>
<table id="tab_id41604400309745">
<tablerow>
<tablecell>
<paragraph role="paragraph" id="par_id811604400309745">
-<image src="sfx2/res/actionaction013.png" id="img_id381604400309745" width="1cm" height="1cm"><alt id="alt_id131604400309745">Gear Icon</alt></image>
+<image src="sfx2/res/menu.svg" id="img_id381604400309745" width="1cm" height="1cm"><alt id="alt_id131604400309745">Hamburger Icon</alt></image>
</paragraph>
</tablecell>
<tablecell>
- <paragraph id="par_id421604400309745" role="paragraph">Gear icon</paragraph>
+ <paragraph id="par_id421604400309745" role="paragraph">Hamburger icon</paragraph>
</tablecell>
</tablerow>
</table>
<bookmark xml-lang="en-US" branch="hid/cui/ui/menuassignpage/minusbtn" id="bm_id714748" localize="false"/>
<h3 id="hd_id651514304289436" xml-lang="en-US">Remove</h3>
- <paragraph role="paragraph" id="par_id61514304306614" xml-lang="en-US"><ahelp hid=".">Click on the gear icon and then choose Delete to delete the menu.</ahelp></paragraph>
+ <paragraph role="paragraph" id="par_id61514304306614" xml-lang="en-US"><ahelp hid=".">Click on the hamburger icon and then choose Delete to delete the menu.</ahelp></paragraph>
<note id="par_idN10910">You can only delete custom menus and custom menu entries.</note>
<bookmark xml-lang="en-US" branch="hid/cui/ui/menuassignpage/remove" id="bm_id7147410" localize="false"/>
<section id="assigned_commands">
diff --git a/source/text/shared/01/06140400.xhp b/source/text/shared/01/06140400.xhp
index bfb6eff03..f8669e62d 100644
--- a/source/text/shared/01/06140400.xhp
+++ b/source/text/shared/01/06140400.xhp
@@ -1,7 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
<!--
* This file is part of the LibreOffice project.
*
@@ -19,8 +16,6 @@
* 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="textshared0106140400xml" indexer="include" status="PUBLISH">
@@ -31,43 +26,43 @@
<body>
<section id="toolbars">
<bookmark xml-lang="en-US" branch="hid/CUI_HID_SVX_CONFIG_TOOLBAR" id="bm_id7147433" localize="false"/>
-<paragraph role="heading" id="hd_id3154100" xml-lang="en-US" level="1"><link href="text/shared/01/06140400.xhp" name="Toolbars">Toolbars</link></paragraph>
+<h1 id="hd_id3154100"><link href="text/shared/01/06140400.xhp" name="Toolbars">Toolbars</link></h1>
<paragraph role="paragraph" id="par_id3150279" xml-lang="en-US"><ahelp hid=".">Lets you customize $[officename] toolbars.</ahelp></paragraph>
</section>
<section id="howtoget">
<embed href="text/shared/00/00000406.xhp#symbole"/>
</section>
-<paragraph role="heading" id="hd_id611514302475667" level="2" xml-lang="en-US">Search</paragraph>
+<h2 id="hd_id611514302475667">Search</h2>
<paragraph role="paragraph" id="par_id771514302498290" xml-lang="en-US">Enter a string in the text box to narrow the search of commands.</paragraph>
-<paragraph role="heading" id="hd_id441514302482125" level="2" xml-lang="en-US">Category</paragraph>
+<h2 id="hd_id441514302482125">Category</h2>
<paragraph role="paragraph" id="par_id811514302506979" xml-lang="en-US">Select the command category in the drop-down list to restrict the search of commands or scroll the list below. Macros and styles commands are in the bottom of the list.</paragraph>
-<paragraph role="heading" id="hd_id551514302487751" level="2" xml-lang="en-US">Function</paragraph>
+<h2 id="hd_id551514302487751">Function</h2>
<paragraph role="paragraph" id="par_id831514302518564" xml-lang="en-US">Displays the results of the combination of the search string and category of the desired function.</paragraph>
-<paragraph role="heading" id="hd_id221514304363862" level="2" xml-lang="en-US">Description</paragraph>
+<h2 id="hd_id221514304363862">Description</h2>
<paragraph role="paragraph" id="par_id841514304376338" xml-lang="en-US">The text box contains a short description of the selected command.</paragraph>
-<paragraph role="heading" id="hd_id541514303919911" level="2" xml-lang="en-US">Scope</paragraph>
+<h2 id="hd_id541514303919911">Scope</h2>
<paragraph role="paragraph" id="hd_id231514303933476" xml-lang="en-US">Select the location where the toolbar is to be attached. If attached to a %PRODUCTNAME module, the toolbar is available for all files opened in that module. If attached to the file, the toolbar will be available only when that file is opened and active.</paragraph>
-<paragraph role="heading" id="hd_id581514303962835" level="2" xml-lang="en-US">Target</paragraph>
+<h2 id="hd_id581514303962835">Target</h2>
<paragraph role="paragraph" id="par_id921514303969718" xml-lang="en-US">Select the toolbar where the customization is to be applied. The current set of functions is displayed in the box below.</paragraph>
-<paragraph role="heading" id="hd_id351514304283480" level="2" xml-lang="en-US">Add</paragraph>
-<paragraph role="paragraph" id="par_id151514304300251" xml-lang="en-US">Click on the gear icon and then choose Add to add a new toolbar.</paragraph>
-<paragraph role="heading" id="hd_id651514304289436" level="2" xml-lang="en-US">Delete</paragraph>
-<paragraph role="paragraph" id="par_id61514304306614" xml-lang="en-US">Click on the gear icon and then choose Delete to delete the toolbar.</paragraph>
-<paragraph role="note" id="par_idN10910" xml-lang="en-US">You can only delete custom toolbar and custom toolbar entries.</paragraph>
-<paragraph role="heading" id="hd_id961514303975994" level="2" xml-lang="en-US">Right Arrow button</paragraph>
+<h2 id="hd_id351514304283480">Add</h2>
+<paragraph role="paragraph" id="par_id151514304300251" xml-lang="en-US">Click on the hamburger icon and then choose Add to add a new toolbar.</paragraph>
+<h2 id="hd_id651514304289436">Delete</h2>
+<paragraph role="paragraph" id="par_id61514304306614" xml-lang="en-US">Click on the hamburger icon and then choose Delete to delete the toolbar.</paragraph>
+<note id="par_idN10910">You can only delete custom toolbar and custom toolbar entries.</note>
+<h2 id="hd_id961514303975994">Right Arrow button</h2>
<paragraph role="paragraph" id="par_id941514303982378" xml-lang="en-US">Click on the right arrow button to select a function on the left display box and copy to the right display box. This will add the function to the selected toolbar.</paragraph>
-<paragraph role="heading" id="hd_id161514303992615" level="2" xml-lang="en-US">Left Arrow button</paragraph>
+<h2 id="hd_id161514303992615">Left Arrow button</h2>
<paragraph role="paragraph" id="par_id361514304000470" xml-lang="en-US">Click on the left arrow button to remove the selected command from the current toolbar.</paragraph>
-<paragraph role="heading" id="hd_id761514304005994" level="2" xml-lang="en-US">Up and Down Arrow buttons</paragraph>
+<h2 id="hd_id761514304005994">Up and Down Arrow buttons</h2>
<paragraph role="paragraph" id="par_id761514304011466" xml-lang="en-US">Click on the Up or Down arrows on the right to move the selected command upward or downward in the list of displayed toolbar commands.</paragraph>
-<paragraph role="tip" id="par_id301514305066046" xml-lang="en-US">You can drag and drop the selected command to move it to the position you want.</paragraph>
-<paragraph role="heading" id="hd_id321514310951605" level="2" xml-lang="en-US">Insert</paragraph>
-<paragraph id="par_id981514310786648" role="paragraph" xml-lang="en-US"><emph>Insert Separator</emph>: Add a separator mark to improve toolbar readability and to group commands by subject.</paragraph>
-<paragraph role="heading" id="hd_id341514311059169" level="2" xml-lang="en-US">Modify</paragraph>
+<tip id="par_id301514305066046">You can drag and drop the selected command to move it to the position you want.</tip>
+<h2 id="hd_id321514310951605">Insert</h2>
+<paragraph id="par_id981514310786648" role="paragraph" xml-lang="en-US"><emph>Insert Separator</emph>: Add a separator mark to improve toolbar readability and to group commands by subject.</paragraph>
+<h2 id="hd_id341514311059169">Modify</h2>
<list type="unordered">
<listitem>
- <paragraph id="par_id111514311020590" role="listitem" xml-lang="en-US"><emph>Rename</emph>: Rename the entry.</paragraph>
+ <paragraph id="par_id111514311020590" role="listitem" xml-lang="en-US"><emph>Rename</emph>: Rename the entry.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_idN106B2" xml-lang="en-US"><emph>Change Icon</emph>: Opens the <link href="text/shared/01/06140402.xhp" name="Change Icon">Change Icon</link> dialog, where you can assign a different icon to the current command.</paragraph>
@@ -76,11 +71,11 @@
<paragraph role="listitem" id="par_idN106B8" xml-lang="en-US"><emph>Reset Icon</emph>: Resets the icon to the default icon.</paragraph>
</listitem>
<listitem>
- <paragraph id="par_id371514386517453" role="listitem" xml-lang="en-US"><emph>Restore Default Command</emph>: Restores the default command. </paragraph>
+ <paragraph id="par_id371514386517453" role="listitem" xml-lang="en-US"><emph>Restore Default Command</emph>: Restores the default command. </paragraph>
</listitem>
</list>
-<paragraph role="heading" id="hd_id641514311180774" level="2" xml-lang="en-US">Defaults</paragraph>
-<paragraph id="par_id851514311086417" role="listitem" xml-lang="en-US">Deletes all changes previously made to this toolbar.</paragraph>
+<h2 id="hd_id641514311180774">Defaults</h2>
+<paragraph id="par_id851514311086417" role="listitem" xml-lang="en-US">Deletes all changes previously made to this toolbar.</paragraph>
<section id="relatedtopics">
<embed href="text/shared/guide/edit_symbolbar.xhp#edit_symbolbar"/>
diff --git a/source/text/shared/01/minimal_column_width.xhp b/source/text/shared/01/minimal_column_width.xhp
index 5188827f9..b95548ef9 100644
--- a/source/text/shared/01/minimal_column_width.xhp
+++ b/source/text/shared/01/minimal_column_width.xhp
@@ -48,9 +48,7 @@
</case>
<default>
<paragraph role="paragraph" id="par_id201655811553407"><menuitem>Minimal Column Width</menuitem> seeks to find a column width that allows each paragraph in the selected column(s) to fit exactly on a single line. This means that column widths are adjusted in relation to the length of the longest paragraph in each of the selected columns. The final result depends on the paragraph length in the selected columns.</paragraph>
- <paragraph role="paragraph" id="par_id721655811560679"></paragraph>
<paragraph role="paragraph" id="par_id971654218805882">To minimize a single column, it is sufficient to place the cursor in a cell in the column to be minimized. To minimize multiple columns, it is sufficient to select one cell from each column to be minimized.</paragraph>
- <paragraph role="paragraph" id="par_id1001654218953554"></paragraph>
<paragraph role="paragraph" id="par_id91656110781159">The command can be useful for reducing the width of tables.</paragraph>
</default>
</switch>
diff --git a/source/text/shared/02/03130000.xhp b/source/text/shared/02/03130000.xhp
index 35e74c129..2ffae46f0 100644
--- a/source/text/shared/02/03130000.xhp
+++ b/source/text/shared/02/03130000.xhp
@@ -30,7 +30,7 @@
<body>
<section id="borders">
<bookmark xml-lang="en-US" branch="hid/.uno:SetBorderStyle" id="bm_id5165835" localize="false"/>
-<paragraph role="heading" id="hd_id3143284" xml-lang="en-US" level="1"><link href="text/shared/02/03130000.xhp" name="Borders">Borders</link></paragraph>
+<h1 id="hd_id3143284"><link href="text/shared/02/03130000.xhp" name="Borders">Borders</link></h1>
<paragraph role="paragraph" id="par_id3153255" xml-lang="en-US"><ahelp hid=".uno:SetBorderStyle">Click the <emph>Borders</emph> icon to open the <emph>Borders</emph> toolbar, where you can modify the border of a sheet area or an object.</ahelp></paragraph>
</section>
<paragraph role="paragraph" id="par_id3147261" xml-lang="en-US"><switchinline select="appl"><caseinline select="CALC">
@@ -40,10 +40,10 @@
<section id="syborders">
<table id="tbl_id3147088">
<tablerow>
- <tablecell colspan="" rowspan="">
- <paragraph role="paragraph" id="par_id3147576" xml-lang="en-US"><image id="img_id3149095" src="cmd/sc_setborderstyle.png" width="0.222inch" height="0.222inch"><alt id="alt_id3149095" xml-lang="en-US">Icon</alt></image></paragraph>
+ <tablecell>
+ <paragraph role="paragraph" id="par_id3147576" xml-lang="en-US"><image id="img_id3149095" src="cmd/lc_setborderstyle.svg" width="1cm" height="1cm"><alt id="alt_id3149095" xml-lang="en-US">Icon Borders</alt></image></paragraph>
</tablecell>
- <tablecell colspan="" rowspan="">
+ <tablecell>
<paragraph role="paragraph" id="par_id3152780" xml-lang="en-US">Borders</paragraph>
</tablecell>
</tablerow>
diff --git a/source/text/shared/02/03140000.xhp b/source/text/shared/02/03140000.xhp
index 0b824ac19..4841850c8 100644
--- a/source/text/shared/02/03140000.xhp
+++ b/source/text/shared/02/03140000.xhp
@@ -27,17 +27,17 @@
<body>
<section id="line_style">
<bookmark xml-lang="en-US" branch="hid/.uno:LineStyle" id="bm_id3154545" localize="false"/>
-<paragraph role="heading" id="hd_id3146936" xml-lang="en-US" level="1"><link href="text/shared/02/03140000.xhp" name="Line Style">Line Style</link></paragraph>
+<h1 id="hd_id3146936"><link href="text/shared/02/03140000.xhp" name="Line Style">Line Style</link></h1>
<paragraph role="paragraph" id="par_id3155577" xml-lang="en-US"><ahelp hid=".uno:LineStyle">Click this icon to open the <emph>Line Style</emph> toolbar, where you can modify the border line style.</ahelp></paragraph>
</section>
<paragraph role="paragraph" id="par_id3154926" xml-lang="en-US">This border can be the border of a frame, graphic or table. The <emph>Line Style</emph> icon will only be visible if a graphic, table, chart object or frame has been selected.</paragraph>
<section id="syline_style">
<table id="tbl_id3153089">
<tablerow>
- <tablecell colspan="" rowspan="">
- <paragraph role="paragraph" id="par_id3153377" xml-lang="en-US"><image id="img_id3147102" src="cmd/sc_linestyle.png" width="0.222inch" height="0.222inch"><alt id="alt_id3147102" xml-lang="en-US">Icon</alt></image></paragraph>
+ <tablecell>
+ <paragraph role="paragraph" id="par_id3153377" xml-lang="en-US"><image id="img_id3147102" src="cmd/lc_linestyle.svg" width="1cm" height="1cm"><alt id="alt_id3147102" xml-lang="en-US">Icon Line style</alt></image></paragraph>
</tablecell>
- <tablecell colspan="" rowspan="">
+ <tablecell>
<paragraph role="paragraph" id="par_id3154398" xml-lang="en-US">Line Style</paragraph>
</tablecell>
</tablerow>
diff --git a/source/text/shared/05/new_help.xhp b/source/text/shared/05/new_help.xhp
index ca21fd884..1ed2a3706 100644
--- a/source/text/shared/05/new_help.xhp
+++ b/source/text/shared/05/new_help.xhp
@@ -118,8 +118,7 @@
<paragraph xml-lang="en-US" id="par_idN10933" role="paragraph">To search in the current Help page:</paragraph>
<list type="ordered">
<listitem>
- <paragraph xml-lang="en-US" id="par_idN10939" role="paragraph">Open the View menu of your default web browser and choose <emph>Find on this Page</emph> entry.</paragraph>
- <paragraph xml-lang="en-US" id="par_idN10A36" role="paragraph">You can also press <switchinline select="sys"><caseinline select="MAC"><emph>Command</emph></caseinline><defaultinline><emph>Ctrl</emph></defaultinline></switchinline><emph>+F</emph>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10939" role="paragraph">Open the Search tool in your web browser, which is usually accessible using the <switchinline select="sys"><caseinline select="MAC"><emph>Command</emph></caseinline><defaultinline><emph>Ctrl</emph></defaultinline></switchinline><emph>+F</emph> shortcut.</paragraph>
</listitem>
<listitem>
<paragraph xml-lang="en-US" id="par_idN10A22" role="paragraph">In the <emph>Search for</emph> box, enter the text that you want to find.</paragraph>
diff --git a/source/text/shared/06/youtubevideos.xhp b/source/text/shared/06/youtubevideos.xhp
index f21c009ac..298682104 100644
--- a/source/text/shared/06/youtubevideos.xhp
+++ b/source/text/shared/06/youtubevideos.xhp
@@ -17,7 +17,7 @@
</meta>
<body>
<section id="whatisit">
- <paragraph role="paragraph" id="par_ytvideosample" localize="false" xml-lang="en-US"><object data="" id="Raw0LIxyoRU" type="video/youtube" width="700" height="394"/>
+ <paragraph role="paragraph" id="par_ytvideosample" localize="false" xml-lang="en-US"><object data="" id="PC8M4UzqpqE" type="video/youtube" width="700" height="394"/>
</paragraph>
</section>
</body>
diff --git a/source/text/shared/guide/ctl.xhp b/source/text/shared/guide/ctl.xhp
index 099ce00ef..edf50297f 100644
--- a/source/text/shared/guide/ctl.xhp
+++ b/source/text/shared/guide/ctl.xhp
@@ -42,7 +42,7 @@
</variable></paragraph>
<paragraph role="paragraph" id="par_id3147618" xml-lang="en-US">Currently, $[officename] supports Hindi, Thai, Hebrew, and Arabic as <link href="text/shared/00/00000005.xhp#ctl" name="CTL languages">CTL languages</link>.</paragraph>
<paragraph role="paragraph" id="par_id3155420" xml-lang="en-US">If you select the text flow from right to left, embedded Western text still runs from left to right. The cursor responds to the arrow keys in that Right Arrow moves it "to the text end" and Left Arrow "to the text start".</paragraph>
-<paragraph role="paragraph" id="par_id3145609" xml-lang="en-US">You can change the text writing direction directly be pressing one of the following keys:</paragraph>
+<paragraph role="paragraph" id="par_id3145609" xml-lang="en-US">You can change the text writing direction directly by pressing one of the following key combinations:</paragraph>
<list type="unordered">
<listitem>
<paragraph role="listitem" id="par_id3154758" xml-lang="en-US"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+D or <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Right Shift Key - switch to right-to-left text entry</paragraph>
diff --git a/source/text/shared/guide/start_parameters.xhp b/source/text/shared/guide/start_parameters.xhp
index 6cfe595e7..3c6c1e616 100644
--- a/source/text/shared/guide/start_parameters.xhp
+++ b/source/text/shared/guide/start_parameters.xhp
@@ -77,7 +77,7 @@
</tablerow>
<tablerow>
<tablecell>
- <paragraph id="par_id40161212063110720" role="tablecontent" xml-lang="en-US"><emph>{file} macro:///[Library.Module.MacroName]</emph></paragraph>
+ <paragraph id="par_id40161212063110720" role="tablecontent" xml-lang="en-US"><emph>{file} macro://./[Library.Module.MacroName]</emph></paragraph>
</tablecell>
<tablecell>
<paragraph id="par_id40161212063330252" role="tablecontent" xml-lang="en-US">Opens the file and applies specified macros from the file.</paragraph>
diff --git a/source/text/shared/optionen/01040200.xhp b/source/text/shared/optionen/01040200.xhp
index 31fe317e2..2cc1f0a8f 100644
--- a/source/text/shared/optionen/01040200.xhp
+++ b/source/text/shared/optionen/01040200.xhp
@@ -102,7 +102,6 @@
<bookmark_value>outline folding buttons;settings</bookmark_value>
</bookmark>
<h2 id="hd_id751624630367767">Outline folding</h2>
- <embed href="text/shared/optionen/experimental.xhp#experimental"/>
<h3 id="hd_id671624630372163">Show outline-folding buttons</h3>
<paragraph role="paragraph" id="par_id261624630524895">Displays outline folding buttons on the left of the outline headings.</paragraph>
<h3 id="hd_id211624630375989">Include sub levels</h3>
diff --git a/source/text/shared/optionen/01040600.xhp b/source/text/shared/optionen/01040600.xhp
index 58ca4d557..d5d131ab2 100644
--- a/source/text/shared/optionen/01040600.xhp
+++ b/source/text/shared/optionen/01040600.xhp
@@ -51,6 +51,7 @@
<bookmark_value>hidden fields display (Writer)</bookmark_value>
<bookmark_value>paragraphs; hidden paragraphs (Writer)</bookmark_value>
<bookmark_value>cursor; allowing in protected areas (Writer)</bookmark_value>
+<bookmark_value>Math baseline alignment (Writer)</bookmark_value>
</bookmark>
<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/optformataidspage/OptFormatAidsPage" id="bm_id3155388" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/optformataidspage/@@nowidget@@" id="bm_@@nowidget@@" localize="false"/>
@@ -60,6 +61,9 @@
<section id="howtoget">
<embed href="text/shared/00/00000406.xhp#registerschattencursor"/>
</section>
+<h2 id="hd_id821663355645262">Layout Assistance</h2>
+<h3 id="hd_id971663355698696">Math baseline alignment</h3>
+<paragraph role="paragraph" id="par_id911663355661468">Specifies whether Math formula objects are aligned using the text baseline as reference. Uncheck this option to be able to change the vertical position of Math objects in a paragraph.</paragraph>
<h2 id="hd_id3144510" xml-lang="en-US">Display formatting</h2>
<paragraph role="paragraph" id="par_id3156343" xml-lang="en-US">Defines which formatting marks are visible on screen. Activate the <link href="text/swriter/01/03100000.xhp" name="Formatting marks On/Off"><emph>Formatting Marks</emph></link> icon on the <emph>Standard</emph> bar. All characters that you have selected on the <emph>Formatting Aids</emph> tab page will be displayed.</paragraph>
<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/optformataidspage/paragraph" id="bm_id3150871" localize="false"/>
diff --git a/source/text/shared/optionen/01041000.xhp b/source/text/shared/optionen/01041000.xhp
index 4fa9aadb4..d77ad09e0 100644
--- a/source/text/shared/optionen/01041000.xhp
+++ b/source/text/shared/optionen/01041000.xhp
@@ -33,9 +33,6 @@
<bookmark_value>compatibility settings for MS Word import</bookmark_value>
<bookmark_value>Microsoft Office;importing Word documents</bookmark_value>
<bookmark_value>layout;importing Word documents</bookmark_value>
- <bookmark_value>formatting;printer metrics (Writer)</bookmark_value>
- <bookmark_value>metrics;document formatting (Writer)</bookmark_value>
- <bookmark_value>printer metrics for document formatting (Writer)</bookmark_value>
</bookmark>
<section id="compatibility">
<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/optcompatpage/OptCompatPage" id="bm_id2023987" localize="false"/>
@@ -48,12 +45,6 @@
<embed href="text/shared/00/00000406.xhp#compatibility"/>
</section>
<paragraph role="note" id="par_id3153876" xml-lang="en-US">Some of the settings defined here are only valid for the current document and must be defined separately for each document.</paragraph>
-<section id="printermetrics">
-<bookmark xml-lang="en-US" branch="hid/modules/simpress/ui/optimpressgeneralpage/printermetrics" id="bm_id3153789" localize="false"/>
-<paragraph role="heading" id="hd_id3149400" xml-lang="en-US" level="3">Use printer metrics for document formatting</paragraph>
-<paragraph role="paragraph" id="par_id3155602" xml-lang="en-US"><ahelp hid=".">Specifies that printer metrics are applied for printing and also for formatting the display on the screen. If this box is not checked, a printer independent layout will be used for screen display and printing.</ahelp></paragraph>
-<paragraph role="note" id="par_id3155768" xml-lang="en-US">If you set this option for the current document and then save the document, for example, in an older binary format, this option will not be saved. If you later open the file from the older format, this option will be set by default.</paragraph>
-</section>
<paragraph role="heading" id="hd_id3145640" xml-lang="en-US" level="3">Add spacing between paragraphs and tables</paragraph>
<paragraph role="paragraph" id="par_id3147339" xml-lang="en-US">In $[officename] Writer, paragraph spacing is defined differently than in Microsoft Word documents. If you have defined spacing between two paragraphs or tables, spacing is also added in the corresponding Word documents.</paragraph>
<paragraph role="paragraph" id="par_id3151250" xml-lang="en-US">Specifies whether to add Microsoft Word-compatible spacing between paragraphs and tables in $[officename] Writer text documents.</paragraph>
diff --git a/source/text/shared/optionen/01060300.xhp b/source/text/shared/optionen/01060300.xhp
index a1d1e8ceb..e069df80b 100644
--- a/source/text/shared/optionen/01060300.xhp
+++ b/source/text/shared/optionen/01060300.xhp
@@ -90,9 +90,6 @@
<paragraph role="paragraph" id="par_id3145171" xml-lang="en-US">
<ahelp hid="modules/scalc/ui/scgeneralpage/markhdrcb">Specifies whether to highlight column and row headers in the selected columns or rows.</ahelp>
</paragraph>
- <bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/scgeneralpage/textfmtcb" id="bm_id3153770" localize="false"/>
- <paragraph role="heading" id="hd_id3159252" xml-lang="en-US" level="3">Use printer metrics for text formatting</paragraph>
- <paragraph role="paragraph" id="par_id3145366" xml-lang="en-US"><ahelp hid="modules/scalc/ui/scgeneralpage/textfmtcb">Specifies that printer metrics are applied for printing and also for formatting the display on the screen.</ahelp> If this box is not checked, a printer independent layout will be used for screen display and printing.</paragraph>
<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/scgeneralpage/replwarncb" id="bm_id3153363" localize="false"/>
<paragraph role="heading" id="hd_id3146146" xml-lang="en-US" level="3">Show overwrite warning when pasting data</paragraph>
<paragraph role="paragraph" id="par_id3150872" xml-lang="en-US">
diff --git a/source/text/swriter/01/contentcontrol00.xhp b/source/text/swriter/01/contentcontrol00.xhp
new file mode 100644
index 000000000..46ccac826
--- /dev/null
+++ b/source/text/swriter/01/contentcontrol00.xhp
@@ -0,0 +1,44 @@
+<?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="textswriter01contentcontrol00xml" indexer="include" status="PUBLISH">
+<title id="tit" xml-lang="en-US">Content Control Properties</title>
+<filename>/text/swriter/01/contentcontrol00.xhp</filename>
+</topic>
+</meta>
+<body>
+<section id="contentcontrol">
+<bookmark xml-lang="en-US" branch="hid/.uno:ContentControlProperties" id="bm_id9926450" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/contentcontroldlg/ContentControlDialog" id="bm_id1926107" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/contentcontroldlg/@@nowidget@@" id="bm_id1926108" localize="false"/>
+<paragraph role="heading" id="par_idN10549" xml-lang="en-US" level="1"><link href="text/swriter/01/contentcontrol00.xhp">Content Control Properties</link></paragraph>
+<paragraph role="paragraph" id="par_idN10559" xml-lang="en-US">Allows setting various properties on the content control which is under the current cursor.</paragraph>
+<paragraph role="heading" id="par_idN10550" xml-lang="en-US" level="2">General</paragraph>
+<paragraph role="paragraph" id="par_idN10560" xml-lang="en-US">Content is placeholder text: means that the current content is considered to be placeholder text and will be pre-selected when clicking into the content control, to help replacing the placeholder with actual content.</paragraph>
+<paragraph role="heading" id="par_idN10551" xml-lang="en-US" level="2">Check Box</paragraph>
+<paragraph role="paragraph" id="par_idN10561" xml-lang="en-US">Checked character: this character is used when the checkbox is ticked.</paragraph>
+<paragraph role="paragraph" id="par_idN10562" xml-lang="en-US">Unchecked character: this character is used when the checkbox is unticked.</paragraph>
+<paragraph role="heading" id="par_idN10552" xml-lang="en-US" level="2">List Items</paragraph>
+<paragraph role="paragraph" id="par_idN10563" xml-lang="en-US">This frame lists existing list items, and allows the creation, modification and deletion of them.</paragraph>
+<paragraph role="heading" id="par_idN10553" xml-lang="en-US" level="2">Date Format</paragraph>
+<paragraph role="paragraph" id="par_idN10564" xml-lang="en-US">Once a date is picked for a date content control, this date format will be used to format it before it's inserted into the content control as a string.</paragraph>
+</section>
+</body>
+</helpdocument>
diff --git a/source/text/swriter/01/contentcontrol01.xhp b/source/text/swriter/01/contentcontrol01.xhp
new file mode 100644
index 000000000..9faa6ef72
--- /dev/null
+++ b/source/text/swriter/01/contentcontrol01.xhp
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ -->
+<helpdocument version="1.0">
+<meta>
+<topic id="textswriter01contentcontrol01xml" indexer="include" status="PUBLISH">
+<title id="tit" xml-lang="en-US">Content Control List Item Properties</title>
+<filename>/text/swriter/01/contentcontrol01.xhp</filename>
+</topic>
+</meta>
+<body>
+<section id="contentcontrollistitem">
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/contentcontrollistitemdlg/ContentControlListItemDialog" id="bm_id1926107" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/contentcontrollistitemdlg/@@nowidget@@" id="bm_id1926108" localize="false"/>
+<paragraph role="heading" id="par_idN10549" xml-lang="en-US" level="1"><link href="text/swriter/01/contentcontrol01.xhp">Content Control List Item Properties</link></paragraph>
+<paragraph role="paragraph" id="par_idN10559" xml-lang="en-US">Allows setting properties on one list item of a drop-down content control which is under the current cursor. When a list item is selected, the value of the content control is updated based on that list item. In case display name is non-empty, that is used. Otherwise the value is used.</paragraph>
+<paragraph role="heading" id="par_idN10550" xml-lang="en-US" level="2">Display Name</paragraph>
+<paragraph role="paragraph" id="par_idN10560" xml-lang="en-US">A human-friendly name, describing the list item.</paragraph>
+<paragraph role="heading" id="par_idN10551" xml-lang="en-US" level="2">Value</paragraph>
+<paragraph role="paragraph" id="par_idN10561" xml-lang="en-US">A machine-friendly name, describing the list item.</paragraph>
+</section>
+</body>
+</helpdocument>