merge with DEV300_m94

8 files changed, 8 insertions, 57 deletions

diff --git a/helpcontent2/util/sbasic/makefile.mk b/helpcontent2/util/sbasic/makefile.mk
index b79cb6bcc9..b389c418c3 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 \
diff --git a/helpcontent2/util/scalc/makefile.mk b/helpcontent2/util/scalc/makefile.mk
index c5d9b0cbf5..e44424f8ee 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 \
diff --git a/helpcontent2/util/schart/makefile.mk b/helpcontent2/util/schart/makefile.mk
index 0eb859a989..af7502bc5f 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 \
diff --git a/helpcontent2/util/sdatabase/makefile.mk b/helpcontent2/util/sdatabase/makefile.mk
index 3af9db8e5c..5a29e0315e 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 \
diff --git a/helpcontent2/util/sdraw/makefile.mk b/helpcontent2/util/sdraw/makefile.mk
index ea99a877b3..b216372f3b 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 \
diff --git a/helpcontent2/util/simpress/makefile.mk b/helpcontent2/util/simpress/makefile.mk
index e1cb5db140..494cd75032 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 \
diff --git a/helpcontent2/util/smath/makefile.mk b/helpcontent2/util/smath/makefile.mk
index de5ede8126..fc8767572b 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 \
diff --git a/helpcontent2/util/swriter/makefile.mk b/helpcontent2/util/swriter/makefile.mk
index 6e89183d78..63c3df0e3f 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 \