Merge commit 'ooo/DEV300_m103'

Conflicts:
helpcontent2/helpers/hid.lst
helpcontent2/source/text/scalc/01/04050000.xhp
helpcontent2/source/text/scalc/guide/text_rotate.xhp
helpcontent2/source/text/shared/01/04110000.xhp
helpcontent2/source/text/shared/01/06040000.xhp
helpcontent2/source/text/shared/02/01170202.xhp
helpcontent2/source/text/shared/main0108.xhp
helpcontent2/source/text/shared/optionen/01030000.xhp
helpcontent2/source/text/swriter/01/05150101.xhp
helpcontent2/util/target.pmk

9 files changed, 16 insertions, 57 deletions

diff --git a/helpcontent2/util/sbasic/makefile.mk b/helpcontent2/util/sbasic/makefile.mk
index ebb4fe79fa..460f7f06c8 100644
--- a/helpcontent2/util/sbasic/makefile.mk
+++ b/helpcontent2/util/sbasic/makefile.mk
@@ -371,17 +371,11 @@ LINKLINKFILES= \
    text$/shared$/00$/00000020.xhp \
    text$/shared$/00$/00000021.xhp \
    text$/shared$/00$/00000099.xhp \
-   text$/shared$/00$/00000202.xhp \
-   text$/shared$/00$/00000203.xhp \
-   text$/shared$/00$/00000204.xhp \
-   text$/shared$/00$/00000205.xhp \
+   text$/shared$/00$/00000200.xhp \
    text$/shared$/00$/00000206.xhp \
    text$/shared$/00$/00000207.xhp \
    text$/shared$/00$/00000208.xhp \
    text$/shared$/00$/00000210.xhp \
-   text$/shared$/00$/00000212.xhp \
-   text$/shared$/00$/00000213.xhp \
-   text$/shared$/00$/00000214.xhp \
    text$/shared$/00$/00000215.xhp \
    text$/shared$/00$/00000401.xhp \
    text$/shared$/00$/00000402.xhp \
@@ -1157,6 +1151,7 @@ LINKLINKFILES= \
    text$/shared$/guide$/xsltfilter_distribute.xhp \
    text$/shared$/main0108.xhp \
    text$/shared$/main0201.xhp \
+   text$/shared$/main0204.xhp \
    text$/shared$/main0208.xhp \
    text$/shared$/main0209.xhp \
    text$/shared$/main0212.xhp \
diff --git a/helpcontent2/util/scalc/makefile.mk b/helpcontent2/util/scalc/makefile.mk
index d34a69618c..d2a962e418 100644
--- a/helpcontent2/util/scalc/makefile.mk
+++ b/helpcontent2/util/scalc/makefile.mk
@@ -384,17 +384,11 @@ LINKLINKFILES= \
    text$/shared$/00$/00000020.xhp \
    text$/shared$/00$/00000021.xhp \
    text$/shared$/00$/00000099.xhp \
-   text$/shared$/00$/00000202.xhp \
-   text$/shared$/00$/00000203.xhp \
-   text$/shared$/00$/00000204.xhp \
-   text$/shared$/00$/00000205.xhp \
+   text$/shared$/00$/00000200.xhp \
    text$/shared$/00$/00000206.xhp \
    text$/shared$/00$/00000207.xhp \
    text$/shared$/00$/00000208.xhp \
    text$/shared$/00$/00000210.xhp \
-   text$/shared$/00$/00000212.xhp \
-   text$/shared$/00$/00000213.xhp \
-   text$/shared$/00$/00000214.xhp \
    text$/shared$/00$/00000215.xhp \
    text$/shared$/00$/00000401.xhp \
    text$/shared$/00$/00000402.xhp \
@@ -1170,6 +1164,7 @@ LINKLINKFILES= \
    text$/shared$/guide$/xsltfilter_distribute.xhp \
    text$/shared$/main0108.xhp \
    text$/shared$/main0201.xhp \
+   text$/shared$/main0204.xhp \
    text$/shared$/main0208.xhp \
    text$/shared$/main0209.xhp \
    text$/shared$/main0212.xhp \
diff --git a/helpcontent2/util/schart/makefile.mk b/helpcontent2/util/schart/makefile.mk
index 5fcbdb4353..65e2319f7c 100644
--- a/helpcontent2/util/schart/makefile.mk
+++ b/helpcontent2/util/schart/makefile.mk
@@ -72,17 +72,11 @@ LINKLINKFILES= \
    text$/shared$/00$/00000020.xhp \
    text$/shared$/00$/00000021.xhp \
    text$/shared$/00$/00000099.xhp \
-   text$/shared$/00$/00000202.xhp \
-   text$/shared$/00$/00000203.xhp \
-   text$/shared$/00$/00000204.xhp \
-   text$/shared$/00$/00000205.xhp \
+   text$/shared$/00$/00000200.xhp \
    text$/shared$/00$/00000206.xhp \
    text$/shared$/00$/00000207.xhp \
    text$/shared$/00$/00000208.xhp \
    text$/shared$/00$/00000210.xhp \
-   text$/shared$/00$/00000212.xhp \
-   text$/shared$/00$/00000213.xhp \
-   text$/shared$/00$/00000214.xhp \
    text$/shared$/00$/00000215.xhp \
    text$/shared$/00$/00000401.xhp \
    text$/shared$/00$/00000402.xhp \
@@ -858,6 +852,7 @@ LINKLINKFILES= \
    text$/shared$/guide$/xsltfilter_distribute.xhp \
    text$/shared$/main0108.xhp \
    text$/shared$/main0201.xhp \
+   text$/shared$/main0204.xhp \
    text$/shared$/main0208.xhp \
    text$/shared$/main0209.xhp \
    text$/shared$/main0212.xhp \
diff --git a/helpcontent2/util/sdatabase/makefile.mk b/helpcontent2/util/sdatabase/makefile.mk
index 5eccd2587d..2740765bd7 100644
--- a/helpcontent2/util/sdatabase/makefile.mk
+++ b/helpcontent2/util/sdatabase/makefile.mk
@@ -70,17 +70,11 @@ LINKLINKFILES= \
    text$/shared$/00$/00000020.xhp \
    text$/shared$/00$/00000021.xhp \
    text$/shared$/00$/00000099.xhp \
-   text$/shared$/00$/00000202.xhp \
-   text$/shared$/00$/00000203.xhp \
-   text$/shared$/00$/00000204.xhp \
-   text$/shared$/00$/00000205.xhp \
+   text$/shared$/00$/00000200.xhp \
    text$/shared$/00$/00000206.xhp \
    text$/shared$/00$/00000207.xhp \
    text$/shared$/00$/00000208.xhp \
    text$/shared$/00$/00000210.xhp \
-   text$/shared$/00$/00000212.xhp \
-   text$/shared$/00$/00000213.xhp \
-   text$/shared$/00$/00000214.xhp \
    text$/shared$/00$/00000215.xhp \
    text$/shared$/00$/00000401.xhp \
    text$/shared$/00$/00000402.xhp \
@@ -856,6 +850,7 @@ LINKLINKFILES= \
    text$/shared$/guide$/xsltfilter_distribute.xhp \
    text$/shared$/main0108.xhp \
    text$/shared$/main0201.xhp \
+   text$/shared$/main0204.xhp \
    text$/shared$/main0208.xhp \
    text$/shared$/main0209.xhp \
    text$/shared$/main0212.xhp \
diff --git a/helpcontent2/util/sdraw/makefile.mk b/helpcontent2/util/sdraw/makefile.mk
index 44505704c0..06bfdb066a 100644
--- a/helpcontent2/util/sdraw/makefile.mk
+++ b/helpcontent2/util/sdraw/makefile.mk
@@ -305,17 +305,11 @@ LINKLINKFILES= \
    text$/shared$/00$/00000020.xhp \
    text$/shared$/00$/00000021.xhp \
    text$/shared$/00$/00000099.xhp \
-   text$/shared$/00$/00000202.xhp \
-   text$/shared$/00$/00000203.xhp \
-   text$/shared$/00$/00000204.xhp \
-   text$/shared$/00$/00000205.xhp \
+   text$/shared$/00$/00000200.xhp \
    text$/shared$/00$/00000206.xhp \
    text$/shared$/00$/00000207.xhp \
    text$/shared$/00$/00000208.xhp \
    text$/shared$/00$/00000210.xhp \
-   text$/shared$/00$/00000212.xhp \
-   text$/shared$/00$/00000213.xhp \
-   text$/shared$/00$/00000214.xhp \
    text$/shared$/00$/00000215.xhp \
    text$/shared$/00$/00000401.xhp \
    text$/shared$/00$/00000402.xhp \
@@ -1091,6 +1085,7 @@ LINKLINKFILES= \
    text$/shared$/guide$/xsltfilter_distribute.xhp \
    text$/shared$/main0108.xhp \
    text$/shared$/main0201.xhp \
+   text$/shared$/main0204.xhp \
    text$/shared$/main0208.xhp \
    text$/shared$/main0209.xhp \
    text$/shared$/main0212.xhp \
diff --git a/helpcontent2/util/simpress/makefile.mk b/helpcontent2/util/simpress/makefile.mk
index 9691acde22..df0528c229 100644
--- a/helpcontent2/util/simpress/makefile.mk
+++ b/helpcontent2/util/simpress/makefile.mk
@@ -307,17 +307,11 @@ LINKLINKFILES= \
    text$/shared$/00$/00000020.xhp \
    text$/shared$/00$/00000021.xhp \
    text$/shared$/00$/00000099.xhp \
-   text$/shared$/00$/00000202.xhp \
-   text$/shared$/00$/00000203.xhp \
-   text$/shared$/00$/00000204.xhp \
-   text$/shared$/00$/00000205.xhp \
+   text$/shared$/00$/00000200.xhp \
    text$/shared$/00$/00000206.xhp \
    text$/shared$/00$/00000207.xhp \
    text$/shared$/00$/00000208.xhp \
    text$/shared$/00$/00000210.xhp \
-   text$/shared$/00$/00000212.xhp \
-   text$/shared$/00$/00000213.xhp \
-   text$/shared$/00$/00000214.xhp \
    text$/shared$/00$/00000215.xhp \
    text$/shared$/00$/00000401.xhp \
    text$/shared$/00$/00000402.xhp \
@@ -1093,6 +1087,7 @@ LINKLINKFILES= \
    text$/shared$/guide$/xsltfilter_distribute.xhp \
    text$/shared$/main0108.xhp \
    text$/shared$/main0201.xhp \
+   text$/shared$/main0204.xhp \
    text$/shared$/main0208.xhp \
    text$/shared$/main0209.xhp \
    text$/shared$/main0212.xhp \
diff --git a/helpcontent2/util/smath/makefile.mk b/helpcontent2/util/smath/makefile.mk
index 5767221c6a..14640f5b6e 100644
--- a/helpcontent2/util/smath/makefile.mk
+++ b/helpcontent2/util/smath/makefile.mk
@@ -150,17 +150,11 @@ LINKLINKFILES= \
    text$/shared$/00$/00000020.xhp \
    text$/shared$/00$/00000021.xhp \
    text$/shared$/00$/00000099.xhp \
-   text$/shared$/00$/00000202.xhp \
-   text$/shared$/00$/00000203.xhp \
-   text$/shared$/00$/00000204.xhp \
-   text$/shared$/00$/00000205.xhp \
+   text$/shared$/00$/00000200.xhp \
    text$/shared$/00$/00000206.xhp \
    text$/shared$/00$/00000207.xhp \
    text$/shared$/00$/00000208.xhp \
    text$/shared$/00$/00000210.xhp \
-   text$/shared$/00$/00000212.xhp \
-   text$/shared$/00$/00000213.xhp \
-   text$/shared$/00$/00000214.xhp \
    text$/shared$/00$/00000215.xhp \
    text$/shared$/00$/00000401.xhp \
    text$/shared$/00$/00000402.xhp \
@@ -936,6 +930,7 @@ LINKLINKFILES= \
    text$/shared$/guide$/xsltfilter_distribute.xhp \
    text$/shared$/main0108.xhp \
    text$/shared$/main0201.xhp \
+   text$/shared$/main0204.xhp \
    text$/shared$/main0208.xhp \
    text$/shared$/main0209.xhp \
    text$/shared$/main0212.xhp \
diff --git a/helpcontent2/util/swriter/makefile.mk b/helpcontent2/util/swriter/makefile.mk
index 80e2f1ad68..3c848bc0df 100644
--- a/helpcontent2/util/swriter/makefile.mk
+++ b/helpcontent2/util/swriter/makefile.mk
@@ -390,7 +390,6 @@ LINKLINKFILES= \
    text$/swriter$/guide$/section_edit.xhp \
    text$/swriter$/guide$/section_insert.xhp \
    text$/swriter$/guide$/sections.xhp \
-   text$/swriter$/guide$/select_language.xhp \
    text$/swriter$/guide$/send2html.xhp \
    text$/swriter$/guide$/shortcut_writing.xhp \
    text$/swriter$/guide$/smarttags.xhp \
@@ -463,17 +462,11 @@ LINKLINKFILES= \
    text$/shared$/00$/00000020.xhp \
    text$/shared$/00$/00000021.xhp \
    text$/shared$/00$/00000099.xhp \
-   text$/shared$/00$/00000202.xhp \
-   text$/shared$/00$/00000203.xhp \
-   text$/shared$/00$/00000204.xhp \
-   text$/shared$/00$/00000205.xhp \
+   text$/shared$/00$/00000200.xhp \
    text$/shared$/00$/00000206.xhp \
    text$/shared$/00$/00000207.xhp \
    text$/shared$/00$/00000208.xhp \
    text$/shared$/00$/00000210.xhp \
-   text$/shared$/00$/00000212.xhp \
-   text$/shared$/00$/00000213.xhp \
-   text$/shared$/00$/00000214.xhp \
    text$/shared$/00$/00000215.xhp \
    text$/shared$/00$/00000401.xhp \
    text$/shared$/00$/00000402.xhp \
@@ -1249,6 +1242,7 @@ LINKLINKFILES= \
    text$/shared$/guide$/xsltfilter_distribute.xhp \
    text$/shared$/main0108.xhp \
    text$/shared$/main0201.xhp \
+   text$/shared$/main0204.xhp \
    text$/shared$/main0208.xhp \
    text$/shared$/main0209.xhp \
    text$/shared$/main0212.xhp \
diff --git a/helpcontent2/util/target.pmk b/helpcontent2/util/target.pmk
index 40f6e5d91c..40f6e5d91c 100644..100755
--- a/helpcontent2/util/target.pmk
+++ b/helpcontent2/util/target.pmk