Merge commit 'ooo/DEV300_m103'

Conflicts:
basic/source/runtime/makefile.mk
basic/source/runtime/step2.cxx
desktop/prj/build.lst
desktop/source/app/app.cxx
desktop/source/deployment/registry/dp_backend.cxx
drawinglayer/source/attribute/fontattribute.cxx
editeng/inc/editeng/fontitem.hxx
editeng/source/editeng/edtspell.cxx
editeng/source/misc/svxacorr.cxx
framework/inc/services/substitutepathvars.hxx
framework/source/services/substitutepathvars.cxx
sfx2/qa/cppunit/makefile.mk
sfx2/source/doc/SfxDocumentMetaData.cxx
sfx2/source/doc/objxtor.cxx
svx/source/dialog/svxruler.cxx
sysui/desktop/icons/so9_base_app.ico
sysui/desktop/icons/so9_calc_app.ico
sysui/desktop/icons/so9_draw_app.ico
sysui/desktop/icons/so9_impress_app.ico
sysui/desktop/icons/so9_main_app.ico
sysui/desktop/icons/so9_math_app.ico
sysui/desktop/icons/so9_writer_app.ico
xmlhelp/source/cxxhelp/provider/databases.cxx
xmlhelp/source/cxxhelp/provider/db.cxx
xmlhelp/source/cxxhelp/provider/db.hxx

64 files changed, 0 insertions, 63 deletions

diff --git a/sysui/desktop/icons/makefile.mk b/sysui/desktop/icons/makefile.mk
index ac32cdbe453b..ce5b0b70b636 100755
--- a/sysui/desktop/icons/makefile.mk
+++ b/sysui/desktop/icons/makefile.mk
@@ -127,69 +127,6 @@ all: \
     $(MISC)$/ooo11-math-doc.ico \
     $(MISC)$/ooo11-writer-doc.ico \
     $(MISC)$/ooo11-writer-tem.ico \
-    $(MISC)$/so8-base-app.ico \
-    $(MISC)$/so8-base-doc.ico \
-    $(MISC)$/so8-calc-app.ico \
-    $(MISC)$/so8-calc-doc.ico \
-    $(MISC)$/so8-calc-tem.ico \
-    $(MISC)$/so8-chart-doc.ico \
-    $(MISC)$/so8-configuration.ico \
-    $(MISC)$/so8-draw-app.ico \
-    $(MISC)$/so8-draw-doc.ico \
-    $(MISC)$/so8-draw-tem.ico \
-    $(MISC)$/so8-empty-doc.ico \
-    $(MISC)$/so8-empty-tem.ico \
-    $(MISC)$/so8-image-doc.ico \
-    $(MISC)$/so8-impress-app.ico \
-    $(MISC)$/so8-impress-doc.ico \
-    $(MISC)$/so8-impress-tem.ico \
-    $(MISC)$/so8-macro-doc.ico \
-    $(MISC)$/so8-main-app.ico \
-    $(MISC)$/so8-master-doc.ico \
-    $(MISC)$/so8-math-app.ico \
-    $(MISC)$/so8-math-doc.ico \
-    $(MISC)$/so8-open.ico \
-    $(MISC)$/so8-printer.ico \
-    $(MISC)$/so8-web-doc.ico \
-    $(MISC)$/so8-writer-app.ico \
-    $(MISC)$/so8-writer-doc.ico \
-    $(MISC)$/so8-writer-tem.ico \
-    $(MISC)$/so9_empty_tem.ico \
-    $(MISC)$/so9_math_app.ico \
-    $(MISC)$/so9_global_doc.ico \
-    $(MISC)$/so9_main_app.ico \
-    $(MISC)$/so9_empty_doc.ico \
-    $(MISC)$/so9_math_doc.ico \
-    $(MISC)$/so9_base_app.ico \
-    $(MISC)$/so9_html_doc.ico \
-    $(MISC)$/so9_impress_doc.ico \
-    $(MISC)$/so9_draw_tem.ico \
-    $(MISC)$/so9_writer_tem.ico \
-    $(MISC)$/so9_impress_app.ico \
-    $(MISC)$/so9_calc_tem.ico \
-    $(MISC)$/so9_base_doc.ico \
-    $(MISC)$/so9_macro_doc.ico \
-    $(MISC)$/so9_calc_doc.ico \
-    $(MISC)$/so9_draw_doc.ico \
-    $(MISC)$/so9_writer_doc.ico \
-    $(MISC)$/so9_calc_app.ico \
-    $(MISC)$/so9_impress_tem.ico \
-    $(MISC)$/so9_chart_doc.ico \
-    $(MISC)$/so9_writer_app.ico \
-    $(MISC)$/so9_draw_app.ico \
-    $(MISC)$/so9_open.ico \
-    $(MISC)$/so7-base-doc.ico \
-    $(MISC)$/so7-calc-doc.ico \
-    $(MISC)$/so7-calc-tem.ico \
-    $(MISC)$/so7-chart-doc.ico \
-    $(MISC)$/so7-draw-doc.ico \
-    $(MISC)$/so7-draw-tem.ico \
-    $(MISC)$/so7-impress-doc.ico \
-    $(MISC)$/so7-impress-tem.ico \
-    $(MISC)$/so7-master-doc.ico \
-    $(MISC)$/so7-math-doc.ico \
-    $(MISC)$/so7-writer-doc.ico \
-    $(MISC)$/so7-writer-tem.ico \
     $(MISC)$/oxt-extension.ico
 
 $(MISC)$/%.ico: %.ico
diff --git a/sysui/desktop/icons/so7-base-doc.ico b/sysui/desktop/icons/so7-base-doc.ico
deleted file mode 100755
index e4beab7270e1..000000000000
--- a/sysui/desktop/icons/so7-base-doc.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so7-calc-doc.ico b/sysui/desktop/icons/so7-calc-doc.ico
deleted file mode 100755
index 8b34fc606c5d..000000000000
--- a/sysui/desktop/icons/so7-calc-doc.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so7-calc-tem.ico b/sysui/desktop/icons/so7-calc-tem.ico
deleted file mode 100755
index d074a214a90b..000000000000
--- a/sysui/desktop/icons/so7-calc-tem.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so7-chart-doc.ico b/sysui/desktop/icons/so7-chart-doc.ico
deleted file mode 100755
index bdc613fb30e2..000000000000
--- a/sysui/desktop/icons/so7-chart-doc.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so7-draw-doc.ico b/sysui/desktop/icons/so7-draw-doc.ico
deleted file mode 100755
index c2881862053a..000000000000
--- a/sysui/desktop/icons/so7-draw-doc.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so7-draw-tem.ico b/sysui/desktop/icons/so7-draw-tem.ico
deleted file mode 100755
index 8d713d0f470e..000000000000
--- a/sysui/desktop/icons/so7-draw-tem.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so7-impress-doc.ico b/sysui/desktop/icons/so7-impress-doc.ico
deleted file mode 100755
index a8f9518e624b..000000000000
--- a/sysui/desktop/icons/so7-impress-doc.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so7-impress-tem.ico b/sysui/desktop/icons/so7-impress-tem.ico
deleted file mode 100755
index ac140b269242..000000000000
--- a/sysui/desktop/icons/so7-impress-tem.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so7-master-doc.ico b/sysui/desktop/icons/so7-master-doc.ico
deleted file mode 100755
index 1c3068715990..000000000000
--- a/sysui/desktop/icons/so7-master-doc.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so7-math-doc.ico b/sysui/desktop/icons/so7-math-doc.ico
deleted file mode 100755
index d1cd9bd4c6bd..000000000000
--- a/sysui/desktop/icons/so7-math-doc.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so7-writer-doc.ico b/sysui/desktop/icons/so7-writer-doc.ico
deleted file mode 100755
index b8eb3df20564..000000000000
--- a/sysui/desktop/icons/so7-writer-doc.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so7-writer-tem.ico b/sysui/desktop/icons/so7-writer-tem.ico
deleted file mode 100755
index 318cce4bc9a7..000000000000
--- a/sysui/desktop/icons/so7-writer-tem.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so8-base-app.ico b/sysui/desktop/icons/so8-base-app.ico
deleted file mode 100755
index 4a22d3529614..000000000000
--- a/sysui/desktop/icons/so8-base-app.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so8-base-doc.ico b/sysui/desktop/icons/so8-base-doc.ico
deleted file mode 100755
index bcddbf957630..000000000000
--- a/sysui/desktop/icons/so8-base-doc.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so8-calc-app.ico b/sysui/desktop/icons/so8-calc-app.ico
deleted file mode 100755
index a28cab56157b..000000000000
--- a/sysui/desktop/icons/so8-calc-app.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so8-calc-doc.ico b/sysui/desktop/icons/so8-calc-doc.ico
deleted file mode 100755
index 5f293dd82c30..000000000000
--- a/sysui/desktop/icons/so8-calc-doc.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so8-calc-tem.ico b/sysui/desktop/icons/so8-calc-tem.ico
deleted file mode 100755
index 98bf90678573..000000000000
--- a/sysui/desktop/icons/so8-calc-tem.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so8-chart-doc.ico b/sysui/desktop/icons/so8-chart-doc.ico
deleted file mode 100755
index 01ff8365434b..000000000000
--- a/sysui/desktop/icons/so8-chart-doc.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so8-configuration.ico b/sysui/desktop/icons/so8-configuration.ico
deleted file mode 100755
index 57f3b6701b30..000000000000
--- a/sysui/desktop/icons/so8-configuration.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so8-draw-app.ico b/sysui/desktop/icons/so8-draw-app.ico
deleted file mode 100755
index 6003ccb3d7c3..000000000000
--- a/sysui/desktop/icons/so8-draw-app.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so8-draw-doc.ico b/sysui/desktop/icons/so8-draw-doc.ico
deleted file mode 100755
index f4f169bd6fb5..000000000000
--- a/sysui/desktop/icons/so8-draw-doc.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so8-draw-tem.ico b/sysui/desktop/icons/so8-draw-tem.ico
deleted file mode 100755
index d3f63c38dbe0..000000000000
--- a/sysui/desktop/icons/so8-draw-tem.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so8-empty-doc.ico b/sysui/desktop/icons/so8-empty-doc.ico
deleted file mode 100755
index b71d2b939ca7..000000000000
--- a/sysui/desktop/icons/so8-empty-doc.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so8-empty-tem.ico b/sysui/desktop/icons/so8-empty-tem.ico
deleted file mode 100755
index 9368b0a81aef..000000000000
--- a/sysui/desktop/icons/so8-empty-tem.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so8-image-doc.ico b/sysui/desktop/icons/so8-image-doc.ico
deleted file mode 100755
index 11b4f0f6c718..000000000000
--- a/sysui/desktop/icons/so8-image-doc.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so8-impress-app.ico b/sysui/desktop/icons/so8-impress-app.ico
deleted file mode 100755
index 8fae43dab26d..000000000000
--- a/sysui/desktop/icons/so8-impress-app.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so8-impress-doc.ico b/sysui/desktop/icons/so8-impress-doc.ico
deleted file mode 100755
index 9a91f89f2900..000000000000
--- a/sysui/desktop/icons/so8-impress-doc.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so8-impress-tem.ico b/sysui/desktop/icons/so8-impress-tem.ico
deleted file mode 100755
index f84f813f992c..000000000000
--- a/sysui/desktop/icons/so8-impress-tem.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so8-macro-doc.ico b/sysui/desktop/icons/so8-macro-doc.ico
deleted file mode 100755
index f3742e1274e7..000000000000
--- a/sysui/desktop/icons/so8-macro-doc.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so8-main-app.ico b/sysui/desktop/icons/so8-main-app.ico
deleted file mode 100755
index aa044ad9c702..000000000000
--- a/sysui/desktop/icons/so8-main-app.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so8-master-doc.ico b/sysui/desktop/icons/so8-master-doc.ico
deleted file mode 100755
index 27a1d2f61c49..000000000000
--- a/sysui/desktop/icons/so8-master-doc.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so8-math-app.ico b/sysui/desktop/icons/so8-math-app.ico
deleted file mode 100755
index 956c259c756a..000000000000
--- a/sysui/desktop/icons/so8-math-app.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so8-math-doc.ico b/sysui/desktop/icons/so8-math-doc.ico
deleted file mode 100755
index e7b88449999f..000000000000
--- a/sysui/desktop/icons/so8-math-doc.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so8-open.ico b/sysui/desktop/icons/so8-open.ico
deleted file mode 100755
index b77a741b338f..000000000000
--- a/sysui/desktop/icons/so8-open.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so8-printer.ico b/sysui/desktop/icons/so8-printer.ico
deleted file mode 100755
index 25e61f8de5d5..000000000000
--- a/sysui/desktop/icons/so8-printer.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so8-web-doc.ico b/sysui/desktop/icons/so8-web-doc.ico
deleted file mode 100755
index 12eeb63cffb2..000000000000
--- a/sysui/desktop/icons/so8-web-doc.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so8-writer-app.ico b/sysui/desktop/icons/so8-writer-app.ico
deleted file mode 100755
index 15f7f92d4b45..000000000000
--- a/sysui/desktop/icons/so8-writer-app.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so8-writer-doc.ico b/sysui/desktop/icons/so8-writer-doc.ico
deleted file mode 100755
index da774be1d3ac..000000000000
--- a/sysui/desktop/icons/so8-writer-doc.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so8-writer-tem.ico b/sysui/desktop/icons/so8-writer-tem.ico
deleted file mode 100755
index 1bdb86c8090f..000000000000
--- a/sysui/desktop/icons/so8-writer-tem.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so9_base_app.ico b/sysui/desktop/icons/so9_base_app.ico
deleted file mode 100755
index 56a323c07e61..000000000000
--- a/sysui/desktop/icons/so9_base_app.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so9_base_doc.ico b/sysui/desktop/icons/so9_base_doc.ico
deleted file mode 100755
index 8cc1d4433c2c..000000000000
--- a/sysui/desktop/icons/so9_base_doc.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so9_calc_app.ico b/sysui/desktop/icons/so9_calc_app.ico
deleted file mode 100755
index 81e6948d3971..000000000000
--- a/sysui/desktop/icons/so9_calc_app.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so9_calc_doc.ico b/sysui/desktop/icons/so9_calc_doc.ico
deleted file mode 100755
index 2b9e514cb97b..000000000000
--- a/sysui/desktop/icons/so9_calc_doc.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so9_calc_tem.ico b/sysui/desktop/icons/so9_calc_tem.ico
deleted file mode 100755
index 17f4823c4374..000000000000
--- a/sysui/desktop/icons/so9_calc_tem.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so9_chart_doc.ico b/sysui/desktop/icons/so9_chart_doc.ico
deleted file mode 100755
index b116c81903b3..000000000000
--- a/sysui/desktop/icons/so9_chart_doc.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so9_draw_app.ico b/sysui/desktop/icons/so9_draw_app.ico
deleted file mode 100755
index a2c108ad6fe2..000000000000
--- a/sysui/desktop/icons/so9_draw_app.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so9_draw_doc.ico b/sysui/desktop/icons/so9_draw_doc.ico
deleted file mode 100755
index 51f95046709a..000000000000
--- a/sysui/desktop/icons/so9_draw_doc.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so9_draw_tem.ico b/sysui/desktop/icons/so9_draw_tem.ico
deleted file mode 100755
index e4b341175bff..000000000000
--- a/sysui/desktop/icons/so9_draw_tem.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so9_empty_doc.ico b/sysui/desktop/icons/so9_empty_doc.ico
deleted file mode 100755
index a3970775e3ed..000000000000
--- a/sysui/desktop/icons/so9_empty_doc.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so9_empty_tem.ico b/sysui/desktop/icons/so9_empty_tem.ico
deleted file mode 100755
index 1b0088b80277..000000000000
--- a/sysui/desktop/icons/so9_empty_tem.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so9_global_doc.ico b/sysui/desktop/icons/so9_global_doc.ico
deleted file mode 100755
index ea4ccb383956..000000000000
--- a/sysui/desktop/icons/so9_global_doc.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so9_html_doc.ico b/sysui/desktop/icons/so9_html_doc.ico
deleted file mode 100755
index 4e5b8bc99c07..000000000000
--- a/sysui/desktop/icons/so9_html_doc.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so9_impress_app.ico b/sysui/desktop/icons/so9_impress_app.ico
deleted file mode 100755
index 0fe4cea9f267..000000000000
--- a/sysui/desktop/icons/so9_impress_app.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so9_impress_doc.ico b/sysui/desktop/icons/so9_impress_doc.ico
deleted file mode 100755
index 5258a8b6aa4c..000000000000
--- a/sysui/desktop/icons/so9_impress_doc.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so9_impress_tem.ico b/sysui/desktop/icons/so9_impress_tem.ico
deleted file mode 100755
index dcdbddb3b654..000000000000
--- a/sysui/desktop/icons/so9_impress_tem.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so9_macro_doc.ico b/sysui/desktop/icons/so9_macro_doc.ico
deleted file mode 100755
index cd004015e63f..000000000000
--- a/sysui/desktop/icons/so9_macro_doc.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so9_main_app.ico b/sysui/desktop/icons/so9_main_app.ico
deleted file mode 100755
index 197b924d3369..000000000000
--- a/sysui/desktop/icons/so9_main_app.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so9_math_app.ico b/sysui/desktop/icons/so9_math_app.ico
deleted file mode 100755
index 4d947c2e593d..000000000000
--- a/sysui/desktop/icons/so9_math_app.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so9_math_doc.ico b/sysui/desktop/icons/so9_math_doc.ico
deleted file mode 100755
index 622ae939d23a..000000000000
--- a/sysui/desktop/icons/so9_math_doc.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so9_open.ico b/sysui/desktop/icons/so9_open.ico
deleted file mode 100755
index 90f193d80dd9..000000000000
--- a/sysui/desktop/icons/so9_open.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so9_writer_app.ico b/sysui/desktop/icons/so9_writer_app.ico
deleted file mode 100755
index 2df20830d9d2..000000000000
--- a/sysui/desktop/icons/so9_writer_app.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so9_writer_doc.ico b/sysui/desktop/icons/so9_writer_doc.ico
deleted file mode 100755
index b0cf11a993c9..000000000000
--- a/sysui/desktop/icons/so9_writer_doc.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so9_writer_tem.ico b/sysui/desktop/icons/so9_writer_tem.ico
deleted file mode 100755
index 2e62a1934646..000000000000
--- a/sysui/desktop/icons/so9_writer_tem.ico
+++ /dev/null